rpms/grace/FC-5 grace.spec,1.9,1.10

[José Abílio Oliveira Matos (jamatos)]

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26726

Modified Files:
	grace.spec 
Log Message:
* Sun Sep 24 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-4
- Move icon from pixmaps to icons/highcolor/48x48/apps



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-5/grace.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grace.spec	11 Sep 2006 20:45:18 -0000	1.9
+++ grace.spec	24 Sep 2006 19:37:29 -0000	1.10
@@ -1,10 +1,10 @@
 Name:           grace
 Version:        5.1.20
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
-# Xbae is BSD and cephes is LGPL, see also Source3 and Source4 
+# cephes is LGPL, see also Source3 and Source4 
 URL:            http://plasma-gate.weizmann.ac.il/Grace/
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
@@ -17,13 +17,13 @@
 
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
-BuildRequires:  openmotif-devel, gcc-gfortran
+BuildRequires:  xbae-devel, gcc-gfortran
 BuildRequires:  desktop-file-utils, font-utils
 
-%if "%{fedora}" >= "5"
-BuildRequires: libXpm-devel
-%else
+%if "%{fedora}" < "5"
 BuildRequires: xorg-x11-devel
+%else
+BuildRequires: libXpm-devel
 %endif
 
 Requires:	nedit
@@ -55,6 +55,7 @@
 %patch
 # remove stripping option to have meaningfull debuginfo packages
 sed -i -e 's/^\(.*INSTALL_PROGRAM.*\) -s /\1 /' */Makefile
+rm -rf Xbae
 
 %build
 cp %{SOURCE3} %{SOURCE4} .
@@ -68,7 +69,8 @@
     --with-x \
     --with-f77=gfortran \
     --with-extra-incpath=%{_includedir}/netcdf-3 \
-    --with-extra-ldpath=%{_libdir}/netcdf-3
+    --with-extra-ldpath=%{_libdir}/netcdf-3 \
+    --with-bundled-xbae=no
     
 make %{?_smp_mflags}
 
@@ -77,7 +79,6 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
-cp Xbae/LICENSE LICENSE.Xbae
 rm -f doc/*.1
 
 mkdir -pm 755                               \
@@ -120,7 +121,7 @@
 ##
 # Desktop stuff
 #
-install -pm 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+install -pm 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
 desktop-file-install --vendor fedora --delete-original    \
     --dir %{buildroot}%{_datadir}/applications          \
@@ -135,15 +136,23 @@
 
 %post
 %{_sbindir}/chkfontpath -q -a %{_datadir}/%{name}/fonts/type1
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %postun
 %{_sbindir}/chkfontpath -q -r %{_datadir}/%{name}/fonts/type1
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README LICENSE.Xbae
+%doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README 
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ doc/ 
 %config(noreplace) %{_sysconfdir}/%{name}/
@@ -152,7 +161,7 @@
 %exclude %{_datadir}/%{name}/include
 %exclude %{_datadir}/%{name}/lib
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/*/*
 %{_mandir}/man*/*
 
 
@@ -166,6 +175,14 @@
 
 
 %changelog
+* Sun Sep 24 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-4
+- Move icon from pixmaps to icons/highcolor/48x48/apps
+
+* Sun Sep 24 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-3
+- Use external xbae.
+- Revert test for fedora macro so that it works by default for latest
+  versions if the macro is not defined.
+
 * Mon Sep 11 2006 José Matos <jamatos[AT]fc.up.pt> - 5.1.20-2
 - Fix html documentation viewer. (#188696)