rpms/k3b/devel k3b.spec,1.96,1.97

[Rex Dieter]

Author: rdieter

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

Modified Files:
	k3b.spec 
Log Message:
* Tue Jul 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.0-2
- Missing Icon of k3b (#611272)



Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- k3b.spec	28 Jun 2010 13:25:58 -0000	1.96
+++ k3b.spec	6 Jul 2010 16:11:29 -0000	1.97
@@ -8,7 +8,7 @@ Name:    k3b
 Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
 Version: 2.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
@@ -106,6 +106,13 @@ make install/fast DESTDIR=%{buildroot} -
 %find_lang libk3bdevice 
 cat libk3bdevice.lang >> libk3b.lang
 
+# k3b app icon missing, https://bugzilla.redhat.com/show_bug.cgi?id=611272
+if [ ! -f %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png ]; then
+  echo "NOTICE: %{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png missing, borrowing oxygen version"
+  install -pD -m644 %{_kde4_iconsdir}/oxygen/32x32/apps/k3b.png \
+        %{buildroot}%{_kde4_iconsdir}/hicolor/32x32/apps/k3b.png
+fi
+
 ## unpackaged files
 # k3bsetup crud
 rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/k3bsetup.mo
@@ -123,13 +130,18 @@ rm -rf %{buildroot}
 
 %postun libs -p /sbin/ldconfig
 
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
 %postun
 if [ $1 -eq 0 ] ; then
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 fi
 
 %posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 update-desktop-database -q &> /dev/null
 update-mime-database %{_kde4_datadir}/mime &> /dev/null
 
@@ -147,6 +159,7 @@ update-mime-database %{_kde4_datadir}/mi
 %{_kde4_datadir}/kde4/services/ServiceMenus/k3b*.desktop
 %{_kde4_datadir}/kde4/servicetypes/k3b*.desktop
 %{_kde4_datadir}/mime/packages/x-k3b.xml
+%{_kde4_iconsdir}/hicolor/*/*/*
 
 %if 0%{?common}
 %files common -f k3b.lang
@@ -167,6 +180,9 @@ update-mime-database %{_kde4_datadir}/mi
 
 
 %changelog
+* Tue Jul 06 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.0-2
+- Missing Icon of k3b (#611272)
+
 * Mon Jun 28 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:2.0.0-1
 - k3b-2.0.0