rpms/wxMaxima/EL-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wxMaxima.spec, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11428

Modified Files:
	.cvsignore sources wxMaxima.spec 
Log Message:
sync w/devel



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	23 Feb 2007 19:38:54 -0000	1.4
+++ .cvsignore	19 Oct 2007 19:41:29 -0000	1.5
@@ -1 +1,3 @@
+clog
 wxMaxima-0.7.1.tar.gz
+wxMaxima-0.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	23 Feb 2007 19:38:54 -0000	1.4
+++ sources	19 Oct 2007 19:41:29 -0000	1.5
@@ -1 +1 @@
-005f5bffe74caa987f66af2084d9df45  wxMaxima-0.7.1.tar.gz
+4a0c6099a60d5f54e262cc505d8caca7  wxMaxima-0.7.2.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/EL-5/wxMaxima.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wxMaxima.spec	23 Feb 2007 19:38:54 -0000	1.7
+++ wxMaxima.spec	19 Oct 2007 19:41:29 -0000	1.8
@@ -1,27 +1,30 @@
 
-# Fedora review
-# http://bugzilla.redhat.com/204832
+# Fedora review: http://bugzilla.redhat.com/204832
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.1
-Release: 2%{?dist}
-License: GPL
+Version: 0.7.2
+Release: 4%{?dist}.1
+
+License: GPLv2+
 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)
 
+# Deployable only where maxima exsists.
+ExclusiveArch: %{ix86} x86_64 ppc sparc
+Requires: maxima >= 5.11
+
+# for gnuplot < 4.2
+Patch1: wxMaxima-0.7.2-old_gnuplot.patch
+
 BuildRequires: desktop-file-utils
 BuildRequires: wxGTK-devel
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick
 BuildRequires: sed
 
-Requires: maxima >= 5.11
-Requires(post): xdg-utils
-Requires(postun): xdg-utils
-
 %description
 A Graphical user interface for the computer algebra system
 Maxima using wxWidgets.
@@ -29,6 +32,9 @@
 %prep
 %setup -q
 
+# for gnuplot < 4.0 (?)
+#patch1 -p1 -b .old_gnuplot
+
 ## 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
@@ -53,10 +59,9 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor="" \
-  --add-category="Education" \
+  --add-category="Development" \
   --add-category="Math" \
   --remove-category="Utility" \
   wxmaxima.desktop 
@@ -76,10 +81,12 @@
 
 
 %post
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 %postun
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
 
 
 %files -f wxMaxima.lang
@@ -89,11 +96,31 @@
 #doc ChangeLog NEWS
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
-%{_datadir}/icons/*/*/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/*.desktop
 
 
 %changelog
+* Fri Oct 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-4.1
+- inline plotting of wxMaxima doesn't work in f7 (#339161)
+
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-4
+- wxmaxima.desktop: Categories=Development,Math
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3-3
+- License: GPLv2+
+- revert to classic icon scriptlets
+- respin (BuildID)
+
+* Mon Jun 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.2-2
+- +ExcludeArch, deployable only where maxima exists
+
+* Mon Apr 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.2-1
+- wxMaxima-0.7.2
+
+* Mon Apr 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-3
+- wxMaxima-0.7.1-old_gnuplot.patch (#235155)
+
 * Fri Feb 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.1-2
 - wxMaxima-0.7.1
 - drop upstreamed patches