[geomview] broken or deprecated mime type (#587570)

[Rex Dieter]

commit 1819d9256881f12f30f0fb4cb74444f05148fdc6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Mar 22 08:10:43 2011 -0500

    broken or deprecated mime type (#587570)

 x-oogl.desktop => application_x-geomview.desktop |    2 +-
 x-oogl.xml => application_x-geomview.xml         |    4 +-
 geomview.desktop                                 |    5 +--
 geomview.spec                                    |   27 +++++++++++++---------
 4 files changed, 21 insertions(+), 17 deletions(-)
---
diff --git a/x-oogl.desktop b/application_x-geomview.desktop
similarity index 83%
rename from x-oogl.desktop
rename to application_x-geomview.desktop
index 71fd50e..6e29466 100644
--- a/x-oogl.desktop
+++ b/application_x-geomview.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=MimeType
-MimeType=object/x-oogl
+Mimetype=appliation/x-geomview
 Icon=geomview
 Patterns=*.oogl;*.off;*.list;*.tlist;*.grp;*.quad;*.mesh;*.inst;*.bez;*.vect;
 Comment=OOGL file
diff --git a/x-oogl.xml b/application_x-geomview.xml
similarity index 85%
rename from x-oogl.xml
rename to application_x-geomview.xml
index b579c0c..947d563 100644
--- a/x-oogl.xml
+++ b/application_x-geomview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
 
-  <mime-type type="object/x-oogl">
+  <mime-type type="application/x-geomview">
     <comment>OOGL file</comment>
     <glob pattern="*.oogl" />
     <glob pattern="*.off" />
@@ -13,7 +13,7 @@
     <glob pattern="*.inst" />
     <glob pattern="*.bez" />
     <glob pattern="*.vect" />
-    <alias type="application/x-geomview"/>
+    <alias type="object/x-oogl"/>
   </mime-type>
 
 </mime-info>
diff --git a/geomview.desktop b/geomview.desktop
index 4de5c2d..0a5d147 100644
--- a/geomview.desktop
+++ b/geomview.desktop
@@ -3,7 +3,6 @@ Name=geomview
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview;model/vrml;object/x-oogl;
+MimeType=application/x-geomview;model/vrml;
 Type=Application
-Encoding=UTF-8
-Categories=Graphics;Math;Science;
+Categories=Education;Graphics;Math;Science;
diff --git a/geomview.spec b/geomview.spec
index f3d2a38..6837bc7 100644
--- a/geomview.spec
+++ b/geomview.spec
@@ -3,12 +3,13 @@
 %define kde4 1
 %else
 %define kde3 1
+%define dt_vendir --vendor=fedora
 %endif
 
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.9.4
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
@@ -19,8 +20,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # app.desktop
 Source1: geomview.desktop
 # mime
-Source10: x-oogl.xml
-Source11: x-oogl.desktop
+Source10: application_x-geomview.xml
+Source11: application_x-geomview.desktop
 #icons
 Source20: hi16-app-geomview.png
 Source21: hi22-app-geomview.png
@@ -114,16 +115,16 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # .desktop entry
-desktop-file-install --vendor="fedora" \
+desktop-file-install %{?dt_vendor} \
   --dir %{buildroot}%{_datadir}/applications \
   %{SOURCE1}
 
 # mime
-install -p -m644 -D %{SOURCE10} %{buildroot}%{_datadir}/mime/packages/x-oogl.xml
+install -p -m644 -D %{SOURCE10} %{buildroot}%{_datadir}/mime/packages/x-geomview.xml
 
 %if 0%{?kde3}
 # mimelnk 
-install -p -m644 -D %{SOURCE11} %{buildroot}%{_datadir}/mimelnk/object/x-oogl.desktop
+install -p -m644 -D %{SOURCE11} %{buildroot}%{_datadir}/mimelnk/application/x-geomview.desktop
 %endif
 
 # app icons
@@ -137,8 +138,8 @@ install -p -m644 -D %{SOURCE26} %{buildroot}%{_datadir}/icons/hicolor/scalable/a
 
 
 # Unpackaged files
-rm -f %{buildroot}%{_infodir}/dir
-rm -f %{buildroot}%{_libdir}/lib*.la
+rm -fv %{buildroot}%{_infodir}/dir
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 
 %clean
@@ -181,10 +182,11 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 %{_datadir}/geomview/
 %{_datadir}/icons/hicolor/*/*/*
 %if 0%{?kde3}
-%{_datadir}/mimelnk/*
+%{_datadir}/mimelnk/*/*.desktop
 %endif
 %{_datadir}/mime/packages/*.xml
-%{_infodir}/*
+%{_infodir}/figs/
+%{_infodir}/geomview*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man5/*
@@ -201,7 +203,10 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 
 %changelog
-* Mon Feb 14 2011 Rex Dieter <rdieter at fedoraproject.rog> 1.9.4-13
+* Tue Mar 22 2011 Rex Dieter <rdieter at fedoraproject.org> 1.9.4-14
+- broken or deprecated mime type (#587570) 
+
+* Mon Feb 14 2011 Rex Dieter <rdieter at fedoraproject.org> 1.9.4-13
 - fix -libs subpkg 
 - drop old baggage