[geomview] 1.9.4-20

[Rex Dieter]

commit a062b9b5b37e1271f3d5fbdf17cb972a1598ef51
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jul 3 14:43:37 2014 -0500

    1.9.4-20
    
    - optimize mimeinfo scriptlets
    - cleanup .spec
    - build against motif

 application_x-geomview.desktop |    7 ----
 geomview.spec                  |   66 ++++++++++------------------------------
 2 files changed, 16 insertions(+), 57 deletions(-)
---
diff --git a/geomview.spec b/geomview.spec
index f1587e7..4fa91eb 100644
--- a/geomview.spec
+++ b/geomview.spec
@@ -1,27 +1,17 @@
 
-%if 0%{?fedora} > 8 || 0%{?rhel} > 5
-%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: 19%{?dist}
+Release: 20%{?dist}
 
 License: LGPLv2+
 Url:     http://www.geomview.org/
-Group:   Applications/Engineering
 Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # app.desktop
 Source1: geomview.desktop
 # mime
 Source10: application_x-geomview.xml
-Source11: application_x-geomview.desktop
 #icons
 Source20: hi16-app-geomview.png
 Source21: hi22-app-geomview.png
@@ -35,34 +25,21 @@ BuildRequires: desktop-file-utils
 BuildRequires: byacc flex
 BuildRequires: gawk
 # Until we have a generic BR: motif-devel -- Rex
-%if 0%{?fedora} > 5
-BuildRequires: lesstif-devel
+%if 0%{?fedora} > 17
+BuildRequires: motif-devel
 %else
 BuildRequires: openmotif-devel
 %endif
 BuildRequires: libGL-devel libGLU-devel
-%if 0%{?fedora} > 4 || 0%{?rhel} > 4
 BuildRequires: libXmu-devel
-%else
-# workaround http://bugzilla.redhat.com/211898
-BuildRequires: xorg-x11-devel xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
-%endif
 BuildRequires: tcl-devel tk-devel
 
 #BuildRequires: /usr/bin/makeinfo 
 BuildRequires: texinfo
 
 #BuildRequires: /usr/bin/texi2html
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires: texi2html
-%else
-BuildRequires: tetex
-%endif
 
-# for %_datadir/mimelnk
-%if 0%{?kde3} && 0%{?fedora} > 6
-Requires: kde-filesystem
-%endif
 Requires: xdg-utils
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -115,18 +92,13 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 # .desktop entry
-desktop-file-install %{?dt_vendor} \
+desktop-file-install \
   --dir %{buildroot}%{_datadir}/applications \
   %{SOURCE1}
 
 # mime
 install -p -m644 -D %{SOURCE10} %{buildroot}%{_datadir}/mime/packages/x-geomview.xml
 
-%if 0%{?kde3}
-# mimelnk 
-install -p -m644 -D %{SOURCE11} %{buildroot}%{_datadir}/mimelnk/application/x-geomview.desktop
-%endif
-
 # 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
@@ -136,19 +108,15 @@ install -p -m644 -D %{SOURCE24} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
 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 -fv %{buildroot}%{_infodir}/dir
 rm -fv %{buildroot}%{_libdir}/lib*.la
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
 /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||:
 touch --no-create %{_datadir}/icons/hicolor ||:
+touch --no-create %{_datadir}/mime ||:
 
 %preun
 if [ $1 -eq 0 ] ;then
@@ -160,30 +128,22 @@ if [ $1 -eq 0 ] ; then
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
 update-desktop-database -a > /dev/null 2>&1 ||:
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
+touch --no-create %{_datadir}/mime ||:
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
 %posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||:
 update-desktop-database -a > /dev/null 2>&1 ||:
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README
 %{_bindir}/*
 %{_docdir}/geomview/
 %{_datadir}/applications/*.desktop
 %{_datadir}/geomview/
 %{_datadir}/icons/hicolor/*/*/*
-%if 0%{?kde3}
-%{_datadir}/mimelnk/*/*.desktop
-%endif
 %{_datadir}/mime/packages/*.xml
 %{_infodir}/figs/
 %{_infodir}/geomview*
@@ -192,17 +152,23 @@ update-mime-database %{_datadir}/mime > /dev/null 2>&1 ||:
 %{_mandir}/man5/*
 %{_libexecdir}/geomview/
 
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
 %files libs
-%defattr(-,root,root,-)
 %{_libdir}/libgeomview-%{version}.so
 
 %files devel
-%defattr(-,root,root,-)
 %{_libdir}/libgeomview.so
 %{_includedir}/geomview/
 
 
 %changelog
+* Thu Jul 03 2014 Rex Dieter <rdieter at fedoraproject.org> - 1.9.4-20
+- optimize mimeinfo scriptlets
+- cleanup .spec
+- build against motif
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.4-19
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild