[kaffeine] reverted to source1

thomasj thomasj at fedoraproject.org
Tue Aug 17 18:50:46 UTC 2010


commit 55b72552b9d37b597483f2b68eeb78807f293ea6
Author: Thomas Janssen <thomasj at fedoraproject.org>
Date:   Tue Aug 17 20:50:38 2010 +0200

    reverted to source1

 .gitignore    |    2 ++
 kaffeine.spec |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76e79b5..145deaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 kaffeine-1.0.tar.gz
 kaffeine.png
+/kaffeine-1.0.tar.gz
+/kaffeine.png
diff --git a/kaffeine.spec b/kaffeine.spec
index e72e343..535b106 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
 Name:    kaffeine
 Version: 1.0
-Release: 6%{?dist}
+Release: 7%{?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
@@ -49,6 +49,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
 
 
@@ -62,7 +64,6 @@ rm -rf %{buildroot}
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
-ln -f -s %{_kde4_iconsdir}/oxygen/48x48/apps/kaffeine.png %{_kde4_iconsdir}/hicolor/48x48/apps/
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -89,6 +90,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
 
 
 %changelog
+* Tue Aug 17 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-7
+- reverted to source
+
 * Tue Aug 17 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-6
 - use ln now to have a kaffeine icon in hicolor
 - working with upstream to get it fixed


More information about the scm-commits mailing list