rpms/wxMaxima/F-7 .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 wxMaxima.spec, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/wxMaxima/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2417

Modified Files:
	.cvsignore sources wxMaxima.spec 
Log Message:
0.7.4



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-7/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	24 Nov 2007 02:51:28 -0000	1.7
+++ .cvsignore	11 Dec 2007 18:09:56 -0000	1.8
@@ -2,3 +2,4 @@
 wxMaxima-0.7.1.tar.gz
 wxMaxima-0.7.2.tar.gz
 wxMaxima-0.7.3a.tar.gz
+wxMaxima-0.7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-7/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	24 Nov 2007 02:51:28 -0000	1.6
+++ sources	11 Dec 2007 18:09:56 -0000	1.7
@@ -1 +1 @@
-bb24cc08495c259413c34870ea2018d7  wxMaxima-0.7.3a.tar.gz
+7baa47204feff25ac252717d65f6799a  wxMaxima-0.7.4.tar.gz


Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/F-7/wxMaxima.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wxMaxima.spec	24 Nov 2007 02:51:28 -0000	1.15
+++ wxMaxima.spec	11 Dec 2007 18:09:56 -0000	1.16
@@ -3,8 +3,8 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 0.7.3a
-Release: 1%{?dist}
+Version: 0.7.4
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -14,6 +14,9 @@
 
 # Deployable only where maxima exsists.
 ExclusiveArch: %{ix86} x86_64 ppc sparc
+
+Provides: wxmaxima = %{version}-%{release}
+
 Requires: maxima >= 5.13
 
 # for gnuplot < 4.2
@@ -45,6 +48,9 @@
   -e "s|^Terminal=0|Terminal=false|" \
   wxmaxima.desktop
 
+# app icon
+convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
+
 
 %build
 %configure \
@@ -55,29 +61,29 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor="" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir %{buildroot}%{_datadir}/applications \
   --add-category="Development" \
   --add-category="Math" \
   --remove-category="Utility" \
   wxmaxima.desktop 
 
 # app icon
-convert -resize 48x48 maxima-new.png wxmaxima.png
-install -p -D -m644 wxmaxima.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
+install -p -D -m644 wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
+install -p -D -m644 wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_datadir}/wxMaxima/{COPYING,README}
+rm -f %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
 
 %find_lang wxMaxima 
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -96,11 +102,17 @@
 #doc ChangeLog NEWS
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
-%{_datadir}/icons/hicolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/*.desktop
 
 
 %changelog
+* Tue Dec 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.4-2
+- fix app icon handling/packaging
+
+* Fri Dec 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.4-1
+- wxMaxima-0.7.4
+
 * Fri Nov 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.3a-1
 - wxMaxima-0.7.3a