[kaffeine] short-term-fix #611273
thomasj
thomasj at fedoraproject.org
Tue Aug 17 17:25:52 UTC 2010
commit e9fd27aa4c9bc7fe7b8bd92ae7db760b1f23e98d
Author: Thomas Janssen <thomasj at fedoraproject.org>
Date: Tue Aug 17 19:25:35 2010 +0200
short-term-fix #611273
kaffeine.spec | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/kaffeine.spec b/kaffeine.spec
index 42e1e90..e72e343 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,13 @@
Name: kaffeine
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?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,8 +49,6 @@ 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
@@ -64,6 +62,7 @@ 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
@@ -90,6 +89,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
%changelog
+* 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
+- fixes #611273
+
* Sun Jul 04 2010 Thomas Janssen <thomasj at fedoraproject.org> 1.0-5
- changed Requires to kdebase-runtime
- added kaffeine.png to fix #611273
More information about the scm-commits
mailing list