[kaffeine/f12/master] added kaffeine.png, Requires kdebase-runtime, fixes #611273

thomasj thomasj at fedoraproject.org
Tue Aug 17 19:41:04 UTC 2010


commit faae1bb562b0ffaea53861dd27008a7aba15aaac
Author: Thomas Janssen <thomasj at fedoraproject.org>
Date:   Tue Aug 17 21:40:56 2010 +0200

    added kaffeine.png, Requires kdebase-runtime, fixes #611273

 .gitignore    |    2 ++
 kaffeine.spec |   11 ++++++++++-
 sources       |    1 +
 3 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88c4c51..fb5aa37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 kaffeine-1.0.tar.gz
+/kaffeine-1.0.tar.gz
+/kaffeine.png
diff --git a/kaffeine.spec b/kaffeine.spec
index 926bd3f..ebbf7d7 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,14 @@
 
 Name:    kaffeine
 Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?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
@@ -20,6 +21,8 @@ BuildRequires: xine-lib-devel libXScrnSaver-devel
 Obsoletes: kaffeine-libs < 1.0
 Obsoletes: kaffeine-devel < 1.0
 
+Requires: kdebase-runtime
+
 %{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}
 
 %description
@@ -47,6 +50,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 mv %{buildroot}%{_kde4_iconsdir}/oxygen \
    %{buildroot}%{_kde4_iconsdir}/hicolor
 
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_kde4_iconsdir}/hicolor/48x48/apps/kaffeine.png
+
 %find_lang %{name} --with-kde
 
 
@@ -86,6 +91,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Aug 17 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-4
+- added Requires kdebase-runtime
+- added kaffeine.png to fix #611273
+
 * Mon Jun 21 2010 Rex Dieter <rdieter at fedoraproject.org> 1.0-3
 - Unexpanded macro in kdelibs4 dependency (#606134)
 - remove old/unused patches
diff --git a/sources b/sources
index 9787ead..13aa78c 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 81bac76f931245a75f20ed26a37c55e3  kaffeine-1.0.tar.gz
+d3c40c38c24d30e73b90ac6aa81f0059  kaffeine.png


More information about the scm-commits mailing list