[kaffeine] 1.2.2

[Rex Dieter]

commit 1151e9ffa0020cf9abad5e507bfe224fe5a9e2f6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon May 9 20:08:03 2011 -0500

    1.2.2

 .gitignore    |    4 +---
 kaffeine.spec |   19 ++++++++++---------
 sources       |    3 +--
 3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bcaf79a..3798cee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-kaffeine-1.0.tar.gz
-kaffeine.png
-/kaffeine-1.0.tar.gz
 /kaffeine.png
 /kaffeine-1.1.tar.gz
+/kaffeine-1.2.2.tar.gz
diff --git a/kaffeine.spec b/kaffeine.spec
index cace8ac..551d436 100644
--- a/kaffeine.spec
+++ b/kaffeine.spec
@@ -1,13 +1,12 @@
 Name:    kaffeine
-Version: 1.1
-Release: 2%{?dist}
+Version: 1.2.2
+Release: 1%{?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
@@ -46,11 +45,6 @@ rm -rf %{buildroot}
 
 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,32 +58,39 @@ rm -rf %{buildroot}
 
 %post
 touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null || :
+touch --no-create %{_kde4_iconsdir}/oxygen &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
   update-desktop-database %{_datadir}/applications &>/dev/null
   touch --no-create %{_kde4_iconsdir}/hicolor &>/dev/null
   gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+  gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 fi
 
 %posttrans
 update-desktop-database %{_datadir}/applications &>/dev/null
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &>/dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &>/dev/null || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO
+%doc COPYING README
 %{_kde4_bindir}/kaffeine
 %{_kde4_bindir}/kaffeine-xbu
 %{_kde4_appsdir}/kaffeine/
 %{_kde4_appsdir}/solid/actions/*.desktop
 %{_kde4_datadir}/applications/kde4/kaffeine.desktop
 %{_kde4_iconsdir}/hicolor/*/*/*
+%{_kde4_iconsdir}/oxygen/*/*/*
 %{_kde4_appsdir}/profiles/kaffeine.profile.xml
 
 
 %changelog
+* Mon May 09 2011 Rex Dieter <rdieter at fedoraproject.org> 1.2.2-1
+- 1.2.2
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 852e1cf..5a867c7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-d3c40c38c24d30e73b90ac6aa81f0059  kaffeine.png
-72284197b1c90adf75149311e4422efe  kaffeine-1.1.tar.gz
+690e48d2e5fe123887109aa9b1bc1c31  kaffeine-1.2.2.tar.gz