rpms/geomview/FC-4 geomview.desktop,1.2,1.3 geomview.spec,1.7,1.8

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Mon Mar 13 13:27:15 UTC 2006


Author: rdieter

Update of /cvs/extras/rpms/geomview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640

Modified Files:
	geomview.desktop geomview.spec 
Log Message:
* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.3-0.3.cvs20040221
- drop deprecated BR: libGL.so.1,libGLU.so.1 bits
- ExcludeArch: x86_64 (#182625)
- .desktop: MimeType: application/x-geomview



Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- geomview.desktop	3 Jan 2006 15:11:53 -0000	1.2
+++ geomview.desktop	13 Mar 2006 13:27:14 -0000	1.3
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-#MimeType=application/x-geomview
+MimeType=application/x-geomview
 Type=Application
 Encoding=UTF-8
 Categories=Application;Graphics;Scientific;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- geomview.spec	3 Jan 2006 19:51:43 -0000	1.7
+++ geomview.spec	13 Mar 2006 13:27:14 -0000	1.8
@@ -9,7 +9,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.2.cvs%{cvs}%{?dist}.1
+Release: 0.3.cvs%{cvs}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -18,6 +18,8 @@
 #Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz
 Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://bugzilla.redhat.com/bugzilla/182625
+ExcludeArch: x86_64
 
 Obsoletes: %{name}-plugins < %{version}-%{release}
 Provides:  %{name}-plugins = %{version}-%{release}
@@ -41,11 +43,7 @@
 BuildRequires: openmotif-devel
 BuildRequires: xforms-devel
 ## X/GL support
-%if "%{?fedora}" > "3"
 BuildRequires: libGL-devel libGLU-devel
-%else
-BuildRequires: libGL.so.1 libGLU.so.1
-%endif
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -173,12 +171,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%POST
+%post
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ] ;then
@@ -186,10 +183,9 @@
 fi
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||:
 
 
 %files
@@ -249,6 +245,14 @@
 
 
 %changelog
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.3-0.3.cvs20040221
+- drop deprecated BR: libGL.so.1,libGLU.so.1 bits
+- ExcludeArch: x86_64 (#182625)
+- .desktop: MimeType: application/x-geomview
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Tue Jan 03 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.2.cvs20040221
 - rework Obsoletes/Provides: geomview-plugins
 




More information about the fedora-extras-commits mailing list