rpms/k3b/F-13 .cvsignore, 1.29, 1.30 k3b.spec, 1.93, 1.94 sources, 1.30, 1.31

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/k3b/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10852

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



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	17 Jun 2010 15:29:41 -0000	1.29
+++ .cvsignore	6 Jul 2010 16:12:46 -0000	1.30
@@ -1 +1 @@
-k3b-1.93.0rc4.tar.bz2
+k3b-2.0.0.tar.bz2


Index: k3b.spec
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/k3b.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- k3b.spec	17 Jun 2010 17:53:35 -0000	1.93
+++ k3b.spec	6 Jul 2010 16:12:46 -0000	1.94
@@ -4,18 +4,16 @@
 %define common 1
 %endif
 
-%define pre rc4
-
 Name:    k3b
-Summary: CD/DVD burning application
+Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
-Version: 1.93.0
-Release: 1%{?dist}
+Version: 2.0.0
+Release: 2%{?dist}
 
 Group:   Applications/Archiving
 License: GPLv2+
 URL:     http://www.k3b.org/
-Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{pre}.tar.bz2
+Source0: http://downloads.sourceforge.net/sourceforge/k3b/k3b-%{version}%{?pre}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # ie, where cdrecord and friends aren't present
@@ -108,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
@@ -125,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
 
@@ -149,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
@@ -169,6 +180,12 @@ 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
+
 * Thu Jun 17 2010 Rex Dieter <rdieter at fedoraproject.org> - 1:1.93.0-1
 - k3b-1.93.0 (rc3)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/k3b/F-13/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	17 Jun 2010 15:29:41 -0000	1.30
+++ sources	6 Jul 2010 16:12:47 -0000	1.31
@@ -1 +1 @@
-78ce03b8a7d4f9872b4dd0963b77307c  k3b-1.93.0rc4.tar.bz2
+2ec161ccd6c24778d4c5289c85473747  k3b-2.0.0.tar.bz2