rpms/geomview/devel x-oogl.desktop, NONE, 1.1 x-oogl.xml, NONE, 1.1 geomview.desktop, 1.5, 1.6 geomview.spec, 1.39, 1.40

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	geomview.desktop geomview.spec 
Added Files:
	x-oogl.desktop x-oogl.xml 
Log Message:
* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
- use model/vrml,object/x-oogl(register) mimetypes



--- NEW FILE x-oogl.desktop ---
[Desktop Entry]
Type=MimeType
MimeType=object/x-oogl
Icon=geomview
Patterns=*.oogl;*.off;*.list;*.tlist;*;grp;*.quad;*.mesh;*.inst;*.bez;*.vect;
Comment=OOGL file
Encoding=UTF-8


--- NEW FILE x-oogl.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">

  <mime-type type="object/x-oogl">
    <comment>OOGL file</comment>
    <glob pattern="*.oogl" />
    <glob pattern="*.off" />
    <glob pattern="*.list" />
    <glob pattern="*.tlist" />
    <glob pattern="*.grp" />
    <glob pattern="*.quad" />
    <glob pattern="*.mesh" />
    <glob pattern="*.inst" />
    <glob pattern="*.bez" />
    <glob pattern="*.vect" />
    <alias type="application/x-geomview"/>
  </mime-type>

</mime-info>



Index: geomview.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.desktop	16 Jul 2007 16:56:45 -0000	1.5
+++ geomview.desktop	14 Sep 2007 14:30:16 -0000	1.6
@@ -3,7 +3,7 @@
 Comment=An interactive 3D viewing program
 Exec=geomview
 Icon=geomview
-MimeType=application/x-geomview;
+MimeType=application/x-geomview;model/vrml;object/x-oogl;
 Type=Application
 Encoding=UTF-8
 Categories=Graphics;Math;Science;


Index: geomview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/devel/geomview.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- geomview.spec	28 Aug 2007 02:51:40 -0000	1.39
+++ geomview.spec	14 Sep 2007 14:30:16 -0000	1.40
@@ -2,7 +2,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
@@ -15,6 +15,8 @@
 
 Source1: geomview.desktop
 Source2: geomview.png
+Source3: x-oogl.xml
+Source4: x-oogl.desktop
 
 BuildRequires: desktop-file-utils
 BuildRequires: byacc flex
@@ -44,6 +46,8 @@
 BuildRequires: tetex
 %endif
 
+# for %_datadir/mimelnk
+Requires: kde-filesystem
 Requires: xdg-utils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -79,25 +83,31 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 # .desktop entry
 desktop-file-install --vendor="fedora" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --dir %{buildroot}%{_datadir}/applications \
   %{SOURCE1}
 
 # app icon
-install -D -m644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+install -p -m644 -D %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+
+# mime
+install -p -m644 -D %{SOURCE3} %{buildroot}%{_datadir}/mime/packages/x-oogl.xml
+
+# mimelnk (kde3)
+install -p -m644 -D %{SOURCE4} %{buildroot}%{_datadir}/mimelnk/object/x-oogl.desktop
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -105,7 +115,8 @@
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 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 ||:
+update-desktop-database -q > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 %preun
 if [ $1 -eq 0 ] ;then
@@ -116,21 +127,24 @@
 /sbin/ldconfig
 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 ||:
+update-desktop-database -a > /dev/null 2>&1 ||:
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
+%{_bindir}/*
 %{_docdir}/geomview/
 %{_datadir}/applications/*.desktop
+%{_datadir}/geomview/
 %{_datadir}/icons/hicolor/*/*/*
-%{_bindir}/*
+%{_datadir}/mimelnk/*
+%{_datadir}/mime/packages/*.xml
 %{_infodir}/*
 %{_mandir}/man1/*
 %{_mandir}/man3/*
 %{_mandir}/man5/*
-%{_datadir}/geomview/
 %{_libdir}/libgeomview-%{version}.so
 %{_libexecdir}/geomview/
 
@@ -141,6 +155,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
+- use model/vrml,object/x-oogl(register) mimetypes
+
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-2
 - BR: gawk