[gtkwave] Fix scriptlet compatibility for older Fedora releases

Paul Howarth pghmcfc at fedoraproject.org
Fri Oct 3 12:55:13 UTC 2014


commit 7a9423661b1254d365c2b8e218adce6476e9989d
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Oct 3 13:54:28 2014 +0100

    Fix scriptlet compatibility for older Fedora releases

 gtkwave.spec |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/gtkwave.spec b/gtkwave.spec
index 1e6d7cc..3b37fbb 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -3,7 +3,7 @@
 Summary:	Waveform Viewer
 Name:		gtkwave
 Version:	3.3.62
-Release:	%{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}
+Release:	%{?prerel:0.}3%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
@@ -68,7 +68,7 @@ rm -rf %{buildroot}
 touch --no-create %{_datadir}/icons/gnome &>/dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 touch --no-create %{_datadir}/mime/packages &> /dev/null || :
-/usr/bin/update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
@@ -77,14 +77,22 @@ if [ $1 -eq 0 ] ; then
 	touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 	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 || :
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+	update-mime-database -n %{_datadir}/mime &> /dev/null || :
+%else
+	update-mime-database %{_datadir}/mime &> /dev/null || :
+%endif
 fi
-/usr/bin/update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+update-mime-database -n %{_datadir}/mime &> /dev/null || :
+%else
+update-mime-database %{_datadir}/mime &> /dev/null || :
+%endif
 
 %files
 %if 0%{?_licensedir:1}
@@ -183,6 +191,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Fri Oct  3 2014 Paul Howarth <paul at city-fan.org> 3.3.62-3
+- fix scriptlet compatibility for older Fedora releases
+
 * Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> 3.3.62-2
 - update mime scriptlet
 


More information about the scm-commits mailing list