[glabels] update scriptlets, tighten subpkg deps

[Rex Dieter]

commit 1ed101de3d3ce3b81b9823194bc36edbfb7d1818
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 9 08:29:58 2014 -0500

    update scriptlets, tighten subpkg deps

 glabels.spec |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/glabels.spec b/glabels.spec
index b822d7d..589a206 100644
--- a/glabels.spec
+++ b/glabels.spec
@@ -1,6 +1,6 @@
 Name:		glabels
 Version:	3.2.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Summary:	A program for creating labels and business cards for GNOME
 
 Group:		Applications/Publishing
@@ -29,7 +29,7 @@ BuildRequires:	qrencode-devel
 BuildRequires:	zint-devel
 BuildRequires:	itstool
 
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 Requires:	%{name}-doc = %{version}-%{release}
 Requires:	%{name}-templates = %{version}-%{release}
 
@@ -76,7 +76,7 @@ Summary:	The %{name} template database
 Group:		Development/Libraries
 ## Needs the glabels-libs subpackage for proper ownership of the top-level
 ## libglabels-3.0 directory in %%_datadir.
-Requires:	%{name}-libs
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description	templates
 This package contains the template database for %{name}.
@@ -101,25 +101,23 @@ desktop-file-install					\
 
 
 %post
+touch --no-create %{_datadir}/mime/packages &>/dev/null || :
 update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null ||:
 
 %postun
 update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null ||:
 if [ $1 -eq 0 ]; then
 	glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
+	update-mime-database %{_datadir}/mime &> /dev/null || :
 fi
 
-
 %post	libs -p /sbin/ldconfig
 
 %postun	libs -p /sbin/ldconfig
 
-
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
-
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files -f glabels-3.0.lang
 %doc AUTHORS ChangeLog COPYING COPYING.README_FIRST NEWS README TODO
@@ -166,6 +164,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null ||:
 
 
 %changelog
+* Tue Sep 09 2014 Rex Dieter <rdieter at fedoraproject.org> 3.2.0-8
+- update scriptlets, tighten subpkg deps
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild