[gramps] update/fix icon/mime scriptlets, deps

Rex Dieter rdieter at fedoraproject.org
Thu Oct 2 19:05:48 UTC 2014


commit 7d3abe78d3ecf2a6e9145dcf21480300501da4e8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 2 14:05:36 2014 -0500

    update/fix icon/mime scriptlets, deps

 gramps.spec |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/gramps.spec b/gramps.spec
index 2ea34ae..e68fd1d 100644
--- a/gramps.spec
+++ b/gramps.spec
@@ -1,7 +1,7 @@
 #global		_beta 2
 Name:           gramps
 Version:        4.1.0
-Release:        3%{?_beta:.beta%{_beta}}%{?dist}
+Release:        4%{?_beta:.beta%{_beta}}%{?dist}
 Summary:        Genealogical Research and Analysis Management Programming System
 
 Group:          Applications/Productivity
@@ -45,14 +45,6 @@ Requires:	gnu-free-mono-fonts
 Requires:	gnu-free-fonts-common
 Requires:	gnu-free-sans-fonts
 
-Requires(pre): shared-mime-info
-Requires(post): desktop-file-utils
-Requires(post): shared-mime-info
-Requires(post): gtk2
-Requires(preun):  shared-mime-info
-Requires(postun): desktop-file-utils
-Requires(postun): gtk2
-
 %description
 gramps (Genealogical Research and Analysis Management Programming
 System) is a GNOME based genealogy program supporting a Python
@@ -126,20 +118,22 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %post
 update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
 update-desktop-database &> /dev/null ||:
-update-mime-database %{_datadir}/mime &> /dev/null || :
+if [ $1 -eq 0 ]; then
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING FAQ NEWS TODO
@@ -173,6 +167,9 @@ fi
 %{python3_sitelib}/gramps/webapp
 
 %changelog
+* Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> 4.1.0-4
+- update/fix icon/mime scriptlets, deps
+
 * Fri Sep 19 2014 Richard Hughes <richard at hughsie.com> 4.1.0-3
 - Actually install the AppData file
 


More information about the scm-commits mailing list