rpms/gcombust/devel gcombust-0.1.55-desktop.patch, NONE, 1.1 gcombust.png, NONE, 1.1 gcombust.spec, 1.11, 1.12

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/gcombust/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15656

Modified Files:
	gcombust.spec 
Added Files:
	gcombust-0.1.55-desktop.patch gcombust.png 
Log Message:
Moderate fixes, convert to UTF-8.


gcombust-0.1.55-desktop.patch:

--- NEW FILE gcombust-0.1.55-desktop.patch ---
diff -Naupr gcombust-0.1.55.orig/gcombust.desktop gcombust-0.1.55/gcombust.desktop
--- gcombust-0.1.55.orig/gcombust.desktop	2003-06-30 19:08:00.000000000 +0200
+++ gcombust-0.1.55/gcombust.desktop	2007-06-22 15:05:39.000000000 +0200
@@ -1,12 +1,13 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=gcombust
 Name[ca]=gcombust
 Comment=A frontend for mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen
-Comment[ca]=Una interfície per a mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen
+Comment[ca]=Una interfície per a mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen
 Comment[es]=Un interfaz para mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen
 Comment[gl]=Unha interface para mkisofs/mkhybrid/cdda2wav/cdrecord/cdlabelgen
-Icon=gcombust.xpm
+Icon=gcombust
 Terminal=false
 Type=Application
-Categories=Application;System
+Categories=System;
 Exec=gcombust


Index: gcombust.spec
===================================================================
RCS file: /cvs/extras/rpms/gcombust/devel/gcombust.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gcombust.spec	28 Aug 2006 10:02:56 -0000	1.11
+++ gcombust.spec	22 Jun 2007 13:08:16 -0000	1.12
@@ -1,13 +1,15 @@
 Summary: Powerful graphical front-end for mkisofs and cdrecord
 Name: gcombust
 Version: 0.1.55
-Release: 9
+Release: 10
 Epoch: 1
 License: GPL
 Group: Applications/Archiving
 URL: http://www.abo.fi/~jmunsin/gcombust/
-Source: http://www.abo.fi/~jmunsin/gcombust/gcombust-%{version}.tar.gz
-Patch: gcombust-0.1.55-gcc4.patch
+Source0: http://www.abo.fi/~jmunsin/gcombust/gcombust-%{version}.tar.gz
+Source1: gcombust.png
+Patch0: gcombust-0.1.55-gcc4.patch
+Patch1: gcombust-0.1.55-desktop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: cdrecord >= 1.10, mkisofs >= 1.10
 Requires: cdda2wav >= 1.10, cdlabelgen >= 1.5.0
@@ -23,8 +25,9 @@
 
 
 %prep
-%setup
-%patch -p1 -b .gcc4
+%setup -q
+%patch0 -p1 -b .gcc4
+%patch1 -p1 -b .desktop
 
 
 %build
@@ -34,23 +37,47 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
 
+# Replace xpm icon with the same converted to png
+%{__rm} -f %{buildroot}%{_datadir}/pixmaps/gcombust.xpm
+%{__install} -D -p -m 0644 %{SOURCE1} \
+    %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/gcombust.png
+
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog FAQ.shtml NEWS README THANKS TODO README.ms
 %{_bindir}/gcombust
 %{_datadir}/applications/gcombust.desktop
-%{_datadir}/pixmaps/gcombust.xpm
+%{_datadir}/icons/hicolor/48x48/apps/gcombust.png
 
 
 %changelog
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1:0.1.55-10
+- Include desktop patch : UTF-8, remove bogus category and themeable icon.
+- Minor spec file cleanups.
+- Convert xpm icon to png in hicolor, with needed scriplets.
+- Use DESTDIR install method.
+
 * Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1:0.1.55-9
 - FC6 rebuild.
 - Remove perl build requirement, it's a default.
@@ -84,7 +111,7 @@
 * Sat Feb  1 2003 Matthias Saou <http://freshrpms.net/>
 - Update to 0.1.54.
 
-* Sun Dec 22 2002 Ville Skyttä <ville.skytta at iki.fi> - 1:0.1.53-fr1
+* Sun Dec 22 2002 Ville Skyttä <ville.skytta at iki.fi> - 1:0.1.53-fr1
 - Update to 0.1.53.
 - Fix desktop menu entry and build requirements.