rpms/kaffeine/devel .cvsignore, 1.9, 1.10 kaffeine.spec, 1.28, 1.29 sources, 1.9, 1.10

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3724

Modified Files:
	.cvsignore kaffeine.spec sources 
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)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/.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	8 Feb 2010 18:45:28 -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/devel/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	8 Feb 2010 18:45:28 -0000	1.29
@@ -1,12 +1,12 @@
 
-%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
@@ -15,13 +15,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 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
@@ -39,12 +41,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 +55,7 @@ desktop-file-validate %{buildroot}%{_kde
 
 
 %clean
-rm -rf %{buildroot}%{_kde4_datadir}/applications/kde4/kaffeine.desktop
+rm -rf %{buildroot}
 
 
 %post
@@ -74,6 +77,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 +86,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/devel/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	8 Feb 2010 18:45:28 -0000	1.10
@@ -1 +1 @@
-24eee004427d6b3f73ffb85a94fc6e3b  kaffeine-1.0-pre2.tar.gz
+919e29a95b599db5eef74b5983f135f4  kaffeine-1.0-pre3.tar.gz