rpms/maxima/FC-6 maxima.spec,1.42,1.43 xmaxima.desktop,1.4,1.5

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8053

Modified Files:
	maxima.spec xmaxima.desktop 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-7
- respin for sbcl-0.9.18
- fixup %triggerun's
- drop dfi --add-category=X-Fedora



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/maxima.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- maxima.spec	2 Oct 2006 16:55:41 -0000	1.42
+++ maxima.spec	8 Nov 2006 15:08:45 -0000	1.43
@@ -6,7 +6,7 @@
 Name: 	 maxima
 Version: 5.10.0
 
-Release: 5%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -158,7 +158,7 @@
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
 # almost any sbcl will do, but we want to be sure we're using the latest -- Rex
-BuildRequires: sbcl >= 0.9.17
+BuildRequires: sbcl >= 0.9.18
 # maxima requires the *same* (or very similar) version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -239,7 +239,7 @@
 
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" --vendor="fedora" \
+  --vendor="fedora" \
   %{SOURCE2} 
 
 # emaxima LaTeX style
@@ -303,11 +303,16 @@
 ln -sf %{_datadir}/maxima/%{maxima_ver}/emacs/site_start.d/maxima-modes.el %{xemacs_sitelisp}/site-start.d/ ||:
 
 %triggerun -- emacs-common
-[ $2 -eq 0 ] && rm -f %{emacs_sitelisp}/M2*.el* || :
+if [ $2 -eq 0 ]; then
+ rm -f %{emacs_sitelisp}/maxima || :
+ rm -f %{emacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 %triggerun -- xemacs-common
-[ $2 -eq 0 ] && rm -f %{xemacs_sitelisp}/M2*.el* || :
-
+if [ $2 -eq 0 ]; then
+ rm -f %{xemacs_sitelisp}/maxima || :
+ rm -f %{xemacs_sitelisp}/site-start.d/maxima-modes.el* ||:
+fi
 
 
 %clean
@@ -380,6 +385,11 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-7
+- respin for sbcl-0.9.18
+- fixup %%triggerun's
+- drop dfi --add-category=X-Fedora
+
 * Mon Oct 02 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.10.0-5
 - update xdg-utils patch (for .dvi handling too)
 


Index: xmaxima.desktop
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-6/xmaxima.desktop,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xmaxima.desktop	5 Jan 2006 14:56:22 -0000	1.4
+++ xmaxima.desktop	8 Nov 2006 15:08:45 -0000	1.5
@@ -5,5 +5,5 @@
 Icon=maxima
 #MimeType=
 Type=Application
-Categories=Application;Science;Education;Math;
+Categories=Science;Education;Math;
 Encoding=UTF-8