rpms/geomview/EL-5 .cvsignore, 1.15, 1.16 geomview.desktop, 1.5, 1.6 geomview.spec, 1.33, 1.34 sources, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/geomview/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6258

Modified Files:
	.cvsignore geomview.desktop geomview.spec sources 
Log Message:
* Tue Oct 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-4
- more icons (#190218)

* Fri Sep 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-3
- use model/vrml,object/x-oogl(register) mimetypes



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/EL-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Aug 2007 23:18:30 -0000	1.15
+++ .cvsignore	11 Oct 2007 18:01:23 -0000	1.16
@@ -1,4 +1,8 @@
-clog
-geomview.png
-geomview-1.9.3.tar.bz2
+hi16-app-geomview.png
+hi22-app-geomview.png
+hi32-app-geomview.png
+hi48-app-geomview.png
+hi64-app-geomview.png
+hi128-app-geomview.png
+hisc-app-geomview.svgz
 geomview-1.9.4.tar.bz2


Index: geomview.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/EL-5/geomview.desktop,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- geomview.desktop	30 Aug 2007 23:18:30 -0000	1.5
+++ geomview.desktop	11 Oct 2007 18:01:23 -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/EL-5/geomview.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- geomview.spec	30 Aug 2007 23:18:30 -0000	1.33
+++ geomview.spec	11 Oct 2007 18:01:23 -0000	1.34
@@ -2,7 +2,7 @@
 Name:    geomview
 Summary: Interactive 3D viewing program
 Version: 1.9.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
@@ -13,8 +13,19 @@
 # http://bugzilla.redhat.com/bugzilla/182625
 #ExcludeArch: x86_64
 
+# app.desktop
 Source1: geomview.desktop
-Source2: geomview.png
+# mime
+Source10: x-oogl.xml
+Source11: x-oogl.desktop
+#icons
+Source20: hi16-app-geomview.png
+Source21: hi22-app-geomview.png
+Source22: hi32-app-geomview.png
+Source23: hi48-app-geomview.png
+Source24: hi64-app-geomview.png
+Source25: hi128-app-geomview.png
+Source26: hisc-app-geomview.svgz
 
 BuildRequires: desktop-file-utils
 BuildRequires: byacc flex
@@ -44,6 +55,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 +92,38 @@
 
 
 %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
+# mime
+install -p -m644 -D %{SOURCE10} %{buildroot}%{_datadir}/mime/packages/x-oogl.xml
+
+# mimelnk (kde3)
+install -p -m644 -D %{SOURCE11} %{buildroot}%{_datadir}/mimelnk/object/x-oogl.desktop
+
+# app icons
+install -p -m644 -D %{SOURCE20} %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/geomview.png
+install -p -m644 -D %{SOURCE21} %{buildroot}%{_datadir}/icons/hicolor/22x22/apps/geomview.png
+install -p -m644 -D %{SOURCE22} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/geomview.png
+install -p -m644 -D %{SOURCE23} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/geomview.png
+install -p -m644 -D %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/geomview.png
+install -p -m644 -D %{SOURCE25} %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/geomview.png
+install -p -m644 -D %{SOURCE26} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/geomview.svgz
+
 
 # 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 +131,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 +143,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 +171,12 @@
 
 
 %changelog
+* Tue Oct 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.9.4-4
+- more icons (#190218)
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/geomview/EL-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	30 Aug 2007 23:18:30 -0000	1.14
+++ sources	11 Oct 2007 18:01:23 -0000	1.15
@@ -1,2 +1,8 @@
-f5588be3402850ed4cc9ef0dac48013a  geomview.png
+c319d899ffd5fa96351b6f3976e3d3ee  hi16-app-geomview.png
+41db058c92cc41ab9b3a8d2a67369b38  hi22-app-geomview.png
+43b595ec4a0cf31fe4c29c3ff6b4dd04  hi32-app-geomview.png
+03c7658415e7c90616f3418e59fb2045  hi48-app-geomview.png
+9652ede34b6d14bcb236031ec48f06fb  hi64-app-geomview.png
+e47c85fe90b8e6104891428fccc5524b  hi128-app-geomview.png
+17c93b920f033946e1cd40ca3cca547a  hisc-app-geomview.svgz
 f551abe6b6c5ed03dfeddbe564d9de5a  geomview-1.9.4.tar.bz2