rpms/k9copy/F-9 k9copy-2.3.1-ffmpeg.patch, NONE, 1.1 k9copy-2.3.1-gcc44.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 k9copy.spec, 1.7, 1.8 sources, 1.4, 1.5 k9copy-2.1.0-ffmpeg.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

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

Modified Files:
	.cvsignore k9copy.spec sources 
Added Files:
	k9copy-2.3.1-ffmpeg.patch k9copy-2.3.1-gcc44.patch 
Removed Files:
	k9copy-2.1.0-ffmpeg.patch 
Log Message:
* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 2.3.2-1
- k9copy-2.3.2


k9copy-2.3.1-ffmpeg.patch:

--- NEW FILE k9copy-2.3.1-ffmpeg.patch ---
diff -up k9copy-2.3.1-Source/src/import/k9avidecode.cpp.ffmpeg k9copy-2.3.1-Source/src/import/k9avidecode.cpp
--- k9copy-2.3.1-Source/src/import/k9avidecode.cpp.ffmpeg	2009-04-04 03:32:21.000000000 -0500
+++ k9copy-2.3.1-Source/src/import/k9avidecode.cpp	2009-04-06 10:31:37.000000000 -0500
@@ -10,13 +10,13 @@
 //
 //
 #include "k9avidecode.h"
-#include <avcodec.h>
+#include <libavcodec/avcodec.h>
 #include <qimage.h>
 #include <dlfcn.h>
 #include <klocale.h>
 
 #ifdef HAVE_SWSCALE
-#include "swscale.h"
+#include <libswscale/swscale.h>
 
 static int sws_flags = SWS_BICUBIC;
 
diff -up k9copy-2.3.1-Source/src/import/k9avidecode.h.ffmpeg k9copy-2.3.1-Source/src/import/k9avidecode.h
--- k9copy-2.3.1-Source/src/import/k9avidecode.h.ffmpeg	2009-04-04 03:32:21.000000000 -0500
+++ k9copy-2.3.1-Source/src/import/k9avidecode.h	2009-04-06 10:30:10.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.3.1-gcc44.patch:

--- NEW FILE k9copy-2.3.1-gcc44.patch ---
diff -up k9copy-2.3.1-Source/src/core/k9dvdbackupinterface.h.gcc44 k9copy-2.3.1-Source/src/core/k9dvdbackupinterface.h
--- k9copy-2.3.1-Source/src/core/k9dvdbackupinterface.h.gcc44	2009-04-04 03:32:21.000000000 -0500
+++ k9copy-2.3.1-Source/src/core/k9dvdbackupinterface.h	2009-04-06 11:38:29.000000000 -0500
@@ -20,6 +20,7 @@
 #ifndef K9DVDBACKUPINTERFACE_H
 #define K9DVDBACKUPINTERFACE_H
 
+#include "k9common.h"
 #include <QObject>
 class k9DVDBackupInterface : public QObject
 {
diff -up k9copy-2.3.1-Source/src/core/k9tools.h.gcc44 k9copy-2.3.1-Source/src/core/k9tools.h
--- k9copy-2.3.1-Source/src/core/k9tools.h.gcc44	2009-04-04 03:32:21.000000000 -0500
+++ k9copy-2.3.1-Source/src/core/k9tools.h	2009-04-06 11:37:43.000000000 -0500
@@ -12,6 +12,7 @@
 #ifndef K9TOOLS_H
 #define K9TOOLS_H
 
+#include "k9common.h"
 #include <QString>
 #include <QList>
 #include <QComboBox>


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Oct 2008 22:56:32 -0000	1.4
+++ .cvsignore	27 May 2009 14:20:51 -0000	1.5
@@ -1 +1 @@
-k9copy-2.1.0-Source.tar.gz
+k9copy-2.3.2-Source.tar.gz


Index: k9copy.spec
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/k9copy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- k9copy.spec	30 Oct 2008 22:56:32 -0000	1.7
+++ k9copy.spec	27 May 2009 14:20:51 -0000	1.8
@@ -1,7 +1,7 @@
 
 Name:    k9copy
-Version: 2.1.0
-Release: 2%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
 Summary: Video DVD backup and creation program
 Group:   Applications/Multimedia
 License: GPLv2+
@@ -9,11 +9,9 @@
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-Source.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# FIXME: build fails here
-ExcludeArch: ppc ppc64
-
-Patch1: k9copy-2.1.0-ffmpeg.patch
+Patch1: k9copy-2.3.1-ffmpeg.patch
 Patch2: k9copy-2.1.0-mimetype.patch
+Patch3: k9copy-2.3.1-gcc44.patch
 
 BuildRequires: cmake
 BuildRequires: desktop-file-utils
@@ -22,12 +20,10 @@
 BuildRequires: hal-devel
 BuildRequires: kdelibs4-devel
 BuildRequires: libdvdread-devel
+BuildRequires: libmpeg2-devel
 BuildRequires: pkgconfig
 BuildRequires: xine-lib-devel
 
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 Requires: dvd+rw-tools
 Requires: dvdauthor
 
@@ -50,6 +46,7 @@
 
 %patch1 -p1 -b .ffmpeg
 %patch2 -p1 -b .mimetype
+%patch3 -p1 -b .gcc44
 
 
 %build
@@ -62,35 +59,37 @@
   ..
 popd
 
-make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
+make %{?_smp_mflags} -C %{_target_platform}
 
 
 %install
 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
+make install DESTDIR=%{buildroot} -C %{_target_platform}
 
 %find_lang %{name}
 
 
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k9copy.desktop
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/k9copy_assistant.desktop
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %post
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
 %postun
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+if [ $1 -eq 0 ] ; then
+  touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+  gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+fi
 
 
 %files -f %{name}.lang
@@ -103,10 +102,27 @@
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/k9copy.desktop
 %{_kde4_datadir}/applications/kde4/k9copy_assistant.desktop
+%{_kde4_docdir}/HTML/en/k9copy/
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 
 %changelog
+* Wed May 27 2009 Rex Dieter <rdieter at fedoraproject.org> 2.3.2-1
+- k9copy-2.3.2
+
+* Mon Apr 06 2009 Rex Dieter <rdieter at fedoraproject.org> 2.3.1-1
+- k9copy-2.3.1
+- optimize scriptlets
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.3.0-2
+- rebuild for new F11 features
+
+* Thu Mar 12 2009 Rex Dieter <rdieter at fedoraproject.org> 2.3.0-1
+- k9copy-2.3.0
+
+* Fri Feb 20 2009 Rex Dieter <rdieter at fedoraproject.org> 2.2.0-1
+- k9copy-2.2.0
+
 * Thu Oct 30 2008 Rex Dieter <rdieter at fedoraproject.org> 2.1.0-2
 - ExcludeArch: ppc ppc64 (still fails)
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/k9copy/F-9/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Oct 2008 22:56:32 -0000	1.4
+++ sources	27 May 2009 14:20:51 -0000	1.5
@@ -1 +1 @@
-3878d742b769105e013db18a43d60086  k9copy-2.1.0-Source.tar.gz
+bd3eaa33c64d8a2ba28f5385cd85eea2  k9copy-2.3.2-Source.tar.gz


--- k9copy-2.1.0-ffmpeg.patch DELETED ---