rpms/k9copy/F-9 k9copy-2.1.0-ffmpeg.patch, NONE, 1.1 k9copy-2.1.0-mimetype.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 k9copy.spec, 1.6, 1.7 sources, 1.3, 1.4 k9copy-2.0.0-gcc43.patch, 1.2, NONE k9copy-2.0.0-libdvdread_so4.patch, 1.2, NONE k9copy-2.0.2-ffmpeg.patch, 1.3, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/k9copy/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1378

Modified Files:
	.cvsignore k9copy.spec sources 
Added Files:
	k9copy-2.1.0-ffmpeg.patch k9copy-2.1.0-mimetype.patch 
Removed Files:
	k9copy-2.0.0-gcc43.patch k9copy-2.0.0-libdvdread_so4.patch 
	k9copy-2.0.2-ffmpeg.patch 
Log Message:
* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.0-2
- ExcludeArch: ppc ppc64 (still fails)


k9copy-2.1.0-ffmpeg.patch:

--- NEW FILE k9copy-2.1.0-ffmpeg.patch ---
diff -up k9copy-2.1.0-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.1.0-Source/src/import/k9avidecode.cpp
--- k9copy-2.1.0-Source/src/import/k9avidecode.cpp.ffmpeg	2008-10-27 12:33:04.000000000 -0500
+++ k9copy-2.1.0-Source/src/import/k9avidecode.cpp	2008-10-30 11:17:44.000000000 -0500
@@ -10,14 +10,14 @@
 //
 //
 #include "k9avidecode.h"
-#include <avcodec.h>
+#include <libavcodec/avcodec.h>
 #include <qimage.h>
 #include <dlfcn.h>
 #include <klocale.h>
 
 #include "ac.h"
 #ifdef HAVE_SWSCALE
-#include "swscale.h"
+#include <libswscale/swscale.h>
 
 static int sws_flags = SWS_BICUBIC;
 
diff -up k9copy-2.1.0-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.1.0-Source/src/import/k9avidecode.h
--- k9copy-2.1.0-Source/src/import/k9avidecode.h.ffmpeg	2008-10-27 12:33:04.000000000 -0500
+++ k9copy-2.1.0-Source/src/import/k9avidecode.h	2008-10-30 11:18:45.000000000 -0500
@@ -14,12 +14,12 @@
 
 #include "k9common.h"
 #include <qobject.h>
-#include <avformat.h>
+#include <libavformat/avformat.h>
 #include <qimage.h>
 #include <cstdlib>
 #include <QObject>
 #ifdef HAVE_SWSCALE
-#include <swscale.h>
+#include <libswscale/swscale.h>
 #endif
 /**
 	@author Jean-Michel PETIT <k9copy at free.fr>

k9copy-2.1.0-mimetype.patch:

--- NEW FILE k9copy-2.1.0-mimetype.patch ---
diff -up k9copy-2.1.0-Source/k9copy_assistant.desktop.mimetype k9copy-2.1.0-Source/k9copy_assistant.desktop
--- k9copy-2.1.0-Source/k9copy_assistant.desktop.mimetype	2008-10-27 12:33:05.000000000 -0500
+++ k9copy-2.1.0-Source/k9copy_assistant.desktop	2008-10-30 11:35:14.000000000 -0500
@@ -9,9 +9,9 @@ Comment[tr]=DVD9 DVD5 yedekleme aracı
 GenericName=Video DVD Backup
 GenericName[fr]=Backup de DVD Video
 GenericName[tr]=DVD Vidyo Yedekleme Aracı
-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.1.0-Source/k9copy.desktop.mimetype k9copy-2.1.0-Source/k9copy.desktop
--- k9copy-2.1.0-Source/k9copy.desktop.mimetype	2008-10-27 12:33:05.000000000 -0500
+++ k9copy-2.1.0-Source/k9copy.desktop	2008-10-30 11:34:43.000000000 -0500
@@ -9,9 +9,9 @@ Comment[tr]=DVD9 DVD5 yedekleme aracı
 GenericName=Video DVD Backup
 GenericName[fr]=Backup de DVD Video
 GenericName[tr]=DVD Vidyo Yedekleme Aracı
-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/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Sep 2008 20:13:42 -0000	1.3
+++ .cvsignore	30 Oct 2008 22:56:32 -0000	1.4
@@ -1 +1 @@
-k9copy-2.0.2-Source.tar.gz
+k9copy-2.1.0-Source.tar.gz


Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/k9copy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- k9copy.spec	19 Sep 2008 14:11:48 -0000	1.6
+++ k9copy.spec	30 Oct 2008 22:56:32 -0000	1.7
@@ -1,7 +1,7 @@
 
 Name:    k9copy
-Version: 2.0.2
-Release: 4%{?dist}
+Version: 2.1.0
+Release: 2%{?dist}
 Summary: Video DVD backup and creation program
 Group:   Applications/Multimedia
 License: GPLv2+
@@ -9,19 +9,18 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: k9copy-2.0.0-libdvdread_so4.patch
-Patch2: k9copy-2.0.0-gcc43.patch
-# FIXME/TODO: use pkgconfig
-Patch3: k9copy-2.0.2-ffmpeg.patch
-
 # FIXME: build fails here
 ExcludeArch: ppc ppc64
 
+Patch1: k9copy-2.1.0-ffmpeg.patch
+Patch2: k9copy-2.1.0-mimetype.patch
+
 BuildRequires: cmake
+BuildRequires: desktop-file-utils
 BuildRequires: ffmpeg-devel
 BuildRequires: gettext
 BuildRequires: hal-devel
-BuildRequires: kdelibs4-devel libutempter-devel
+BuildRequires: kdelibs4-devel
 BuildRequires: libdvdread-devel
 BuildRequires: pkgconfig
 BuildRequires: xine-lib-devel
@@ -49,16 +48,16 @@
 %prep
 %setup -q  -n %{name}-%{version}-Source
 
-%patch1 -p1 -b .libdvdread_so4
-%patch2 -p1 -b .gcc43
-%patch3 -p1 -b .ffmpeg
+%patch1 -p1 -b .ffmpeg
+%patch2 -p1 -b .mimetype
 
 
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kde4} \
-  -DFFMPEG_INCLUDE_DIR=$(pkg-config libavcodec --variable=includedir) \
+  -DAVCODEC_INCLUDE_DIR=$(pkg-config libavcodec --variable=includedir) \
+  -DAVFORMAT_INCLUDE_DIR=$(pkg-config libavformat --variable=includedir) \
   -DFFMPEGSCALE_INCLUDE_DIR=$(pkg-config libswscale --variable=includedir) \
   ..
 popd
@@ -70,6 +69,16 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+desktop-file-install \
+  --vendor="" \
+  --dir=%{buildroot}%{_kde4_datadir}/applications/kde4/ \
+  %{buildroot}%{_kde4_datadir}/applications/kde4/k9copy.desktop
+
+desktop-file-install \
+  --vendor="" \
+  --dir=%{buildroot}%{_kde4_datadir}/applications/kde4/ \
+  %{buildroot}%{_kde4_datadir}/applications/kde4/k9copy_assistant.desktop
+
 %find_lang %{name}
 
 
@@ -91,12 +100,19 @@
 %{_kde4_bindir}/k9play
 %{_kde4_bindir}/k9xineplayer
 %{_kde4_appsdir}/k9copy/
+%{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/k9copy.desktop
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/applications/kde4/k9copy_assistant.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.0-2
+- ExcludeArch: ppc ppc64 (still fails)
+
+* Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.0-1
+- k9copy-2.1.0
+
 * Fri Sep 19 2008 Rex Dieter <rdieter at fedoraproject.org> 2.0.2-4
 - drop Requires: libdvdcss
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Sep 2008 20:13:42 -0000	1.3
+++ sources	30 Oct 2008 22:56:32 -0000	1.4
@@ -1 +1 @@
-3b9637a07e911184d3557097d42debb1  k9copy-2.0.2-Source.tar.gz
+3878d742b769105e013db18a43d60086  k9copy-2.1.0-Source.tar.gz


--- k9copy-2.0.0-gcc43.patch DELETED ---


--- k9copy-2.0.0-libdvdread_so4.patch DELETED ---


--- k9copy-2.0.2-ffmpeg.patch DELETED ---