rpms/wxMaxima/devel wxMaxima.spec,1.17,1.18

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	wxMaxima.spec 
Log Message:
* Tue Dec 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.7.4-2
- fix app icon handling/packaging



Index: wxMaxima.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wxMaxima/devel/wxMaxima.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wxMaxima.spec	7 Dec 2007 22:00:57 -0000	1.17
+++ wxMaxima.spec	11 Dec 2007 14:36:19 -0000	1.18
@@ -4,7 +4,7 @@
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
 Version: 0.7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
@@ -48,6 +48,9 @@
   -e "s|^Terminal=0|Terminal=false|" \
   wxmaxima.desktop
 
+# app icon
+convert -resize 48x48 wxmaxima.png wxmaxima-48x48.png
+
 
 %build
 %configure \
@@ -58,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
@@ -99,11 +102,14 @@
 #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