rpms/kaffeine/devel kaffeine.spec,1.42,1.43

thomasj thomasj at fedoraproject.org
Sun Jul 4 20:36:39 UTC 2010


Author: thomasj

Update of /cvs/pkgs/rpms/kaffeine/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31550

Modified Files:
	kaffeine.spec 
Log Message:
added kaffeine.png into hicolor to fix #611273


Index: kaffeine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kaffeine/devel/kaffeine.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kaffeine.spec	4 Jul 2010 17:17:05 -0000	1.42
+++ kaffeine.spec	4 Jul 2010 20:36:39 -0000	1.43
@@ -1,12 +1,13 @@
 Name:    kaffeine
 Version: 1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2+
 Summary: KDE media player
 Group:   Applications/Multimedia
 URL:     http://kaffeine.kde.org/
 Source0: http://downloads.sourceforge.net/sourceforge/kaffeine/kaffeine-%{version}.tar.gz
+Source1: kaffeine.png
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstreamable patches
@@ -19,8 +20,7 @@ BuildRequires: xine-lib-devel libXScrnSa
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
-# fix bug #611273
-Requires: oxygen-icon-theme
+Requires: kdebase-runtime
 
 %{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
 
@@ -48,6 +48,7 @@ make install/fast DESTDIR=%{buildroot} -
 
 mv %{buildroot}%{_kde4_iconsdir}/oxygen \
    %{buildroot}%{_kde4_iconsdir}/hicolor
+mv kaffeine.png %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/
 
 %find_lang %{name} --with-kde
 
@@ -88,8 +89,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Jul 04 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-5
+- changed Requires to kdebase-runtime
+- added kaffeine.png to fix #611273
+
 * Sun Jul 04 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-4
-- added Requires oxygen-icon-theme #611273
+- added Requires oxygen-icon-theme
 
 * Mon Jun 21 2010 Rex Dieter <rdieter at fedoraproject.org> 1.0-3
 - Unexpanded macro in kdelibs4 dependency (#606134)



More information about the scm-commits mailing list