rpms/geomview/FC-6 geomview.desktop, 1.3, 1.4 geomview.spec, 1.27, 1.28

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	geomview.desktop geomview.spec 
Log Message:
* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
- fixup desktop-file-install usage
- fixup geomview.desktop Categories

* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
  Conflicts: lam (bug #212435)




Index: geomview.desktop
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.desktop,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- geomview.desktop	12 May 2006 18:53:24 -0000	1.3
+++ geomview.desktop	26 Oct 2006 20:21:06 -0000	1.4
@@ -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;
+Categories=Graphics;Science;Education;Math;


Index: geomview.spec
===================================================================
RCS file: /cvs/extras/rpms/geomview/FC-6/geomview.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- geomview.spec	1 Oct 2006 21:36:53 -0000	1.27
+++ geomview.spec	26 Oct 2006 20:21:06 -0000	1.28
@@ -8,7 +8,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.8.2
-Release: 0.21.%{beta}%{?dist}
+Release: 0.24.%{beta}%{?dist}
 
 License: LGPL
 Url:     http://www.geomview.org/
@@ -190,10 +190,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # .desktop entry
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install --vendor="" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
   %{SOURCE1}
 
 # app icon
@@ -205,9 +203,12 @@
 # maniview manpage
 %{?_with_maniview:install -D -m644 -p src/bin/maniview-%{maniview_ver}/maniview.1 $RPM_BUILD_ROOT%{_mandir}/man1/maniview.1}
 
-# rename animate.1 that Conflicts: ImageMagick
-test -f $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 && \
-  mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1
+# rename animate.1 that Conflicts: ImageMagick (#202039)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/animate.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-animate.1 ||:
+# rename sweep.1 that Conflicts: lam (#212435)
+mv $RPM_BUILD_ROOT%{_mandir}/man1/sweep.1 \
+   $RPM_BUILD_ROOT%{_mandir}/man1/geomview-sweep.1 ||:
 
 # rpmdocs
 make -k -C doc docdir=`pwd`/rpmdocs          install-docDATA ||:
@@ -276,6 +277,14 @@
 
 
 %changelog
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.24.rc9
+- fixup desktop-file-install usage
+- fixup geomview.desktop Categories
+
+* Thu Oct 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.22.rc9
+- rename (man/man1/)sweep.1 -> geomview-sweep.1 to avoid
+  Conflicts: lam (bug #212435)
+
 * Sun Oct 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.2-0.21.rc9
 - 1.8.2rc9