rpms/kaffeine/F-12 kaffeine-1.0-pre3-mkfifo.patch.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kaffeine.spec, 1.28, 1.29 sources, 1.9, 1.10 kaffeine-1.0-pre1-kernel_headers.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6540

Modified Files:
	.cvsignore kaffeine.spec sources 
Added Files:
	kaffeine-1.0-pre3-mkfifo.patch.patch 
Removed Files:
	kaffeine-1.0-pre1-kernel_headers.patch 
Log Message:
* Mon Feb 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.4.pre3
- kaffeine-1.0-pre3
- adjust summary/description: no longer phonon based (uses xine-lib)


kaffeine-1.0-pre3-mkfifo.patch.patch:
 mediawidget.cpp |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE kaffeine-1.0-pre3-mkfifo.patch.patch ---
diff -up kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo kaffeine-1.0-pre3/src/mediawidget.cpp
--- kaffeine-1.0-pre3/src/mediawidget.cpp.mkfifo	2010-01-31 11:04:50.000000000 -0600
+++ kaffeine-1.0-pre3/src/mediawidget.cpp	2010-02-08 12:54:32.323917100 -0600
@@ -43,6 +43,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <sys/stat.h>
 #include "backend-xine/xinemediawidget.h"
 #include "osdwidget.h"
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	14 Aug 2009 13:38:15 -0000	1.9
+++ .cvsignore	18 Mar 2010 20:50:31 -0000	1.10
@@ -1 +1 @@
-kaffeine-1.0-pre2.tar.gz
+kaffeine-1.0-pre3.tar.gz


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-12/kaffeine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- kaffeine.spec	14 Aug 2009 13:38:15 -0000	1.28
+++ kaffeine.spec	18 Mar 2010 20:50:31 -0000	1.29
@@ -1,32 +1,39 @@
 
-%define pre pre2
+%define pre pre3
 
 Name:    kaffeine
 Version: 1.0 
-Release: 0.3.%{pre}%{?dist}
+Release: 0.4.%{pre}%{?dist}
 
 License: GPLv2+
-Summary: Phonon-based media player
+Summary: KDE media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}%{?pre:-%{pre}}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+Patch50: kaffeine-1.0-pre3-mkfifo.patch.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: kdelibs4-devel
-BuildRequires: phonon-devel
+BuildRequires: xine-lib-devel
 
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
+%{?_kde4_version:Requires: kdelibs4 >= %{_kde4_vesion}}
+
 %description
-Kaffeine is a phonon-based media player.
+Kaffeine is a KDE media player.
 
 
 %prep
 %setup -q -n kaffeine-%{version}%{?pre:-%{pre}}
 
+%patch50 -p1 -b .mkfifo
+
 
 %build
 mkdir -p %{_target_platform}
@@ -39,12 +46,13 @@ make %{?_smp_mflags} -C %{_target_platfo
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 mv %{buildroot}%{_kde4_iconsdir}/oxygen \
    %{buildroot}%{_kde4_iconsdir}/hicolor
 
-%find_lang %{name}
+%find_lang %{name} --with-kde
 
 
 %check
@@ -52,7 +60,7 @@ desktop-file-validate %{buildroot}%{_kde
 
 
 %clean
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+rm -rf %{buildroot}
 
 
 %post
@@ -74,6 +82,7 @@ gtk-update-icon-cache %{_datadir}/icons/
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING TODO
 %{_kde4_bindir}/kaffeine
+%{_kde4_bindir}/kaffeine-xbu
 %{_kde4_appsdir}/kaffeine/
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/kaffeine.desktop
@@ -82,6 +91,10 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Mon Feb 08 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.4.pre3
+- kaffeine-1.0-pre3
+- adjust summary/description: no longer phonon based (uses xine-lib)
+
 * Fri Aug 14 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0-0.3.pre2
 - kaffeine-1.0-pre2
 - update %%description/%%summary


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	14 Aug 2009 13:38:15 -0000	1.9
+++ sources	18 Mar 2010 20:50:32 -0000	1.10
@@ -1 +1 @@
-24eee004427d6b3f73ffb85a94fc6e3b  kaffeine-1.0-pre2.tar.gz
+919e29a95b599db5eef74b5983f135f4  kaffeine-1.0-pre3.tar.gz


--- kaffeine-1.0-pre1-kernel_headers.patch DELETED ---