rpms/wxMaxima/FC-6 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wxMaxima.spec, 1.6, 1.7 wxMaxima-0.7.0a-mp.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore sources wxMaxima.spec 
Removed Files:
	wxMaxima-0.7.0a-mp.patch 
Log Message:
* Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-2
- wxMaxima-0.7.1
- drop upstreamed patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Sep 2006 16:41:48 -0000	1.3
+++ .cvsignore	23 Feb 2007 19:38:54 -0000	1.4
@@ -1,2 +1 @@
-wxMaxima-0.7.0.tar.gz
-wxMaxima-0.7.0a.tar.gz
+wxMaxima-0.7.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Sep 2006 16:41:48 -0000	1.3
+++ sources	23 Feb 2007 19:38:54 -0000	1.4
@@ -1 +1 @@
-8ba9720bb96a1e7dcf5b8a3c06177901  wxMaxima-0.7.0a.tar.gz
+005f5bffe74caa987f66af2084d9df45  wxMaxima-0.7.1.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/extras/rpms/wxMaxima/FC-6/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	23 Feb 2007 19:38:54 -0000	1.7
@@ -4,23 +4,23 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.0a
-Release: 3%{?dist}
+Version: 0.7.1
+Release: 2%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/wxmaxima/wxMaxima-%{version}.tar.gz 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch1: wxMaxima-0.7.0a-mp.patch
-
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick
 BuildRequires: sed
 
-Requires: maxima >= 5.10
+Requires: maxima >= 5.11
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 
 %description
 A Graphical user interface for the computer algebra system
@@ -29,9 +29,15 @@
 %prep
 %setup -q
 
-%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 +55,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
@@ -72,12 +76,10 @@
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
 
 
 %files -f wxMaxima.lang
@@ -92,6 +94,16 @@
 
 
 %changelog
+* Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-2
+- wxMaxima-0.7.1
+- drop upstreamed patches
+
+* Mon Dec 18 2006 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.0a-5
+- use xdg-utils in scriptlets
+
+* 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
 


--- wxMaxima-0.7.0a-mp.patch DELETED ---