rpms/k9copy/F-18 FindAv-compat.patch,NONE,1.1 k9copy.spec,1.23,1.24

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/k9copy/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26060

Modified Files:
	k9copy.spec 
Added Files:
	FindAv-compat.patch 
Log Message:
* Sat Apr 27 2013 Sérgio Basto <sergio at serjux.com>
- Switch to ffmpeg-compat.


FindAv-compat.patch:
 FindAvcodec.cmake  |    8 ++++----
 FindAvformat.cmake |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE FindAv-compat.patch ---
--- cmake/FindAvformat.cmake.orig	2013-04-06 21:23:16.976763572 +0100
+++ cmake/FindAvformat.cmake	2013-04-06 23:03:05.577625713 +0100
@@ -8,16 +8,16 @@ ELSE (AVFORMAT_INCLUDE_DIR_FF)
       IF (AVFORMAT_INCLUDE_DIR_LAVC)
           SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat")
       ELSE (AVFORMAT_INCLUDE_DIR_LAVC)
-	  FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS)
+	  FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg-compat/libavformat/avformat.h" PATHS)
 	  IF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
-	    SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat")
+	    SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg-compat/libavformat")
 	  ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF)
       ENDIF (AVFORMAT_INCLUDE_DIR_LAVC)
 ENDIF (AVFORMAT_INCLUDE_DIR_FF)
 
 
 
-FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS ) 
+FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ffmpeg-compat/libavformat.so PATHS ) 
 
 IF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY)
    SET(INC_FOUND TRUE)
--- cmake/FindAvcodec.cmake.orig	2013-04-06 21:25:23.558034558 +0100
+++ cmake/FindAvcodec.cmake	2013-04-06 23:18:42.328590156 +0100
@@ -12,15 +12,15 @@ ELSE (AVCODEC_INCLUDE_DIR_FF)
       IF (AVCODEC_INCLUDE_DIR_LAVC)
           SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/libavcodec")
       ELSE (AVCODEC_INCLUDE_DIR_LAVC)
-	  FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg/libavcodec/avcodec.h" PATHS)
+	  FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg-compat/libavcodec/avcodec.h" PATHS)
 	  IF (AVCODEC_INCLUDE_DIR_FF_LAVC)
-	    SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg/libavcodec")
-	    SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg")
+	    SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg-compat/libavcodec")
+	    SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg-compat")
 	  ENDIF (AVCODEC_INCLUDE_DIR_FF_LAVC)
       ENDIF (AVCODEC_INCLUDE_DIR_LAVC)
 ENDIF (AVCODEC_INCLUDE_DIR_FF)
 
-FIND_LIBRARY(AVCODEC_LIBRARY NAMES ${_lib} PATHS ) 
+FIND_LIBRARY(AVCODEC_LIBRARY NAMES ffmpeg-compat/libavcodec.so PATHS ) 
 
 IF (AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY)
    SET(INC_FOUND TRUE)


Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-18/k9copy.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- k9copy.spec	2 Mar 2012 22:10:03 -0000	1.23
+++ k9copy.spec	27 Apr 2013 20:17:12 -0000	1.24
@@ -1,7 +1,7 @@
 
 Name:    k9copy
 Version: 2.3.8
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: Video DVD backup and creation program
 Group:   Applications/Multimedia
 License: GPLv2+
@@ -9,13 +9,14 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch01: FindAv-compat.patch
 ## upstreamable patches
 # https://sourceforge.net/tracker/?func=detail&aid=3016058&group_id=157868&atid=805546 
 Patch52: k9copy-2.3.8-mimetype.patch 
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
-BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-compat-devel
 BuildRequires: gettext
 %if 0%{?fedora} && 0%{?fedora} < 16
 BuildRequires: hal-devel
@@ -47,6 +48,7 @@
 %prep
 %setup -q  -n %{name}-%{version}-Source
 
+%patch1 -p0 -b .ffmpeg-compat
 %patch52 -p1 -b .mimetype
 
 
@@ -103,6 +105,12 @@
 
 
 %changelog
+* Sat Apr 27 2013 Sérgio Basto <sergio at serjux.com>
+- Switch to ffmpeg-compat.
+
+* Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 2.3.8-3
+- Mass rebuilt for Fedora 19 Features
+
 * Fri Mar 02 2012 Nicolas Chauvet <kwizart at gmail.com> - 2.3.8-2
 - Rebuilt for c++ ABI breakage