rpms/k9copy/devel k9copy-2.3.5-dso.patch, NONE, 1.1 k9copy-2.3.5-mimetype.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 k9copy.spec, 1.17, 1.18 sources, 1.10, 1.11 k9copy-2.1.0-mimetype.patch, 1.1, NONE k9copy-2.3.4-ffmpeg.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/k9copy/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24031

Modified Files:
	.cvsignore k9copy.spec sources 
Added Files:
	k9copy-2.3.5-dso.patch k9copy-2.3.5-mimetype.patch 
Removed Files:
	k9copy-2.1.0-mimetype.patch k9copy-2.3.4-ffmpeg.patch 
Log Message:
* Sun Jun 13 2010 Rex Dieter <rdieter at fedoraproject.org> 2.3.5-1
- k9copy-2.3.5


k9copy-2.3.5-dso.patch:
 CMakeLists.txt |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE k9copy-2.3.5-dso.patch ---
diff -up k9copy-2.3.5-Source/CMakeLists.txt.dso k9copy-2.3.5-Source/CMakeLists.txt
--- k9copy-2.3.5-Source/CMakeLists.txt.dso	2010-02-07 05:30:38.000000000 -0600
+++ k9copy-2.3.5-Source/CMakeLists.txt	2010-06-13 15:33:05.618165751 -0500
@@ -325,9 +325,10 @@ kde4_add_executable(k9copy ${k9copy_SRCS
 kde4_add_executable(k9play ${k9play_SRCS})
 kde4_add_executable(k9xineplayer ${k9xineplayer_SRCS})
 
+target_link_libraries(k9copy ${KDE4_SOLID_LIBS} -ldl )
 target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  -lphonon )
-target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS}  )
-target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lxine )
+target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -ldl )
+target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${X11_X11_LIB} -lxine )
 
 
 install(TARGETS k9copy DESTINATION ${BIN_INSTALL_DIR} )

k9copy-2.3.5-mimetype.patch:
 k9copy.desktop           |    4 ++--
 k9copy_assistant.desktop |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE k9copy-2.3.5-mimetype.patch ---
diff -up k9copy-2.3.5-Source/k9copy_assistant.desktop.mimetype k9copy-2.3.5-Source/k9copy_assistant.desktop
--- k9copy-2.3.5-Source/k9copy_assistant.desktop.mimetype	2010-02-07 05:30:38.000000000 -0600
+++ k9copy-2.3.5-Source/k9copy_assistant.desktop	2010-06-13 15:08:11.298178656 -0500
@@ -12,9 +12,9 @@ GenericName=Video DVD Backup
 GenericName[fr]=Backup de DVD Video
 GenericName[tr]=DVD Vidyo Yedekleme Aracı
 GenericName[ru]=Копирование с видео-DVD
-MimeTypes=
+MimeType=
 Terminal=false
 Icon=k9copy
 X-DocPath=k9copy/index.html
 Categories=Qt;KDE;AudioVideo;DiscBurning;
-X-KDE-StartupNotify=true
\ No newline at end of file
+X-KDE-StartupNotify=true
diff -up k9copy-2.3.5-Source/k9copy.desktop.mimetype k9copy-2.3.5-Source/k9copy.desktop
--- k9copy-2.3.5-Source/k9copy.desktop.mimetype	2010-02-07 05:30:38.000000000 -0600
+++ k9copy-2.3.5-Source/k9copy.desktop	2010-06-13 15:08:01.364178993 -0500
@@ -12,9 +12,9 @@ GenericName=Video DVD Backup
 GenericName[fr]=Backup de DVD Video
 GenericName[tr]=DVD Vidyo Yedekleme Aracı
 GenericName[ru]=Копирование с видео-DVD
-MimeTypes=
+MimeType=
 Terminal=false
 Icon=k9copy
 X-DocPath=k9copy/index.html
 Categories=Qt;KDE;AudioVideo;DiscBurning;
-X-KDE-StartupNotify=true
\ No newline at end of file
+X-KDE-StartupNotify=true


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	23 Dec 2009 19:36:58 -0000	1.10
+++ .cvsignore	13 Jun 2010 20:33:31 -0000	1.11
@@ -1 +1 @@
-k9copy-2.3.4-Source.tar.gz
+k9copy-2.3.5-Source.tar.gz


Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/k9copy.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- k9copy.spec	23 Dec 2009 19:36:58 -0000	1.17
+++ k9copy.spec	13 Jun 2010 20:33:31 -0000	1.18
@@ -1,6 +1,6 @@
 
 Name:    k9copy
-Version: 2.3.4
+Version: 2.3.5
 Release: 1%{?dist}
 Summary: Video DVD backup and creation program
 Group:   Applications/Multimedia
@@ -9,8 +9,9 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: k9copy-2.3.4-ffmpeg.patch
-Patch2: k9copy-2.1.0-mimetype.patch
+# upstreamable patches
+Patch51: k9copy-2.3.5-dso.patch
+Patch52: k9copy-2.3.5-mimetype.patch
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -43,17 +44,14 @@
 %prep
 %setup -q  -n %{name}-%{version}-Source
 
-%patch1 -p1 -b .ffmpeg
-%patch2 -p1 -b .mimetype
+%patch51 -p1 -b .dso
+%patch52 -p1 -b .mimetype
+
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} \
-  -DAVCODEC_INCLUDE_DIR=$(pkg-config libavcodec --variable=includedir) \
-  -DAVFORMAT_INCLUDE_DIR=$(pkg-config libavformat --variable=includedir) \
-  -DFFMPEGSCALE_INCLUDE_DIR=$(pkg-config libswscale --variable=includedir) \
-  ..
+%{cmake_kde4} .. 
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -62,7 +60,7 @@
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 
@@ -104,6 +102,9 @@
 
 
 %changelog
+* Sun Jun 13 2010 Rex Dieter <rdieter at fedoraproject.org> 2.3.5-1
+- k9copy-2.3.5
+
 * Wed Dec 23 2009 Rex Dieter <rdieter at fedoraproject.org> 2.3.4-1
 - k9copy-2.3.4
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Dec 2009 19:36:58 -0000	1.10
+++ sources	13 Jun 2010 20:33:31 -0000	1.11
@@ -1 +1 @@
-7b266bb548c4c649f3a691490ccae81c  k9copy-2.3.4-Source.tar.gz
+808382988bc87c58d7149da97637e57d  k9copy-2.3.5-Source.tar.gz


--- k9copy-2.1.0-mimetype.patch DELETED ---


--- k9copy-2.3.4-ffmpeg.patch DELETED ---