rpms/wxMaxima/devel wxMaxima.spec,1.6,1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	wxMaxima.spec 
Log Message:
* Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-4
- --remove-category=Science;Utility (#215748)



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wxMaxima.spec	9 Oct 2006 14:02:24 -0000	1.6
+++ wxMaxima.spec	22 Nov 2006 16:19:21 -0000	1.7
@@ -5,7 +5,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.0a
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
@@ -31,7 +31,15 @@
 
 %patch1 -p1 -b .mp
 
-sed -i -e "s|^Icon=.*|Icon=wxmaxima|" wxmaxima.desktop
+## wxmaxima.desktop fixups
+# do (some) Categories munging here, some versions of desktop-file-install 
+# (*cough rhel4*) truncate Categories if --remove-category'd items is a
+# substr of another (ie, X-Red-Hat-Base X-Red-Hat-Base-Only)
+sed -i \
+  -e "s|^Categories=.*|Categories=Utility;|" \
+  -e "s|^Icon=.*|Icon=wxmaxima|" \
+  -e "s|^Terminal=0|Terminal=false|" \
+  wxmaxima.desktop
 
 
 %build
@@ -49,12 +57,10 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category="X-Fedora" --vendor="" \
-  --add-category="Science" \
+  --vendor="" \
   --add-category="Education" \
   --add-category="Math" \
-  --remove-category="X-Red-Hat-Base" \
-  --remove-category="X-Red-Hat-Base-Only" \
+  --remove-category="Utility" \
   wxmaxima.desktop 
 
 # app icon
@@ -92,6 +98,9 @@
 
 
 %changelog
+* Wed Nov 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-4
+- --remove-category=Science;Utility (#215748)
+
 * Mon Oct 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.7.0a-3
 - (re)fix typo in %%description