diff --git a/comix.spec b/comix.spec index e12ef8c..d85a961 100644 --- a/comix.spec +++ b/comix.spec @@ -7,11 +7,11 @@ %undefine alphatag %define comix4 1 -%define fedorarel 7 +%define fedorarel 8 Name: comix Version: %{mainver} -Release: %{?ifalpha:0.}%{fedorarel}%{?ifalpha:.%alphatag}%{?dist}.2 +Release: %{?ifalpha:0.}%{fedorarel}%{?ifalpha:.%alphatag}%{?dist} Summary: A user-friendly, customizable image viewer Group: Amusements/Graphics @@ -129,35 +129,27 @@ desktop-file-install \ %pre %gconf_schema_prepare %{name} -exit 0 %post %gconf_schema_upgrade %{name} - -touch --no-create %{_datadir}/icons/hicolor - -update-desktop-database &> /dev/null -update-mime-database %{_datadir}/mime &> /dev/null - -exit 0 +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &>/dev/null || : +/usr/bin/update-desktop-database &> /dev/null || : %preun %gconf_schema_remove %{name} -exit 0 %postun -update-desktop-database &> /dev/null -update-mime-database %{_datadir}/mime &> /dev/null - -[ $1 -eq 0 ] || exit 0 -touch --no-create %{_datadir}/icons/hicolor -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor - -exit 0 +/usr/bin/update-desktop-database &> /dev/null || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +fi %posttrans -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor -exit 0 +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) @@ -181,6 +173,9 @@ exit 0 %changelog +* Tue Sep 09 2014 Rex Dieter 4.0.4-8 +- update scriptlets (icon/mime mostly) + * Sat Jun 07 2014 Fedora Release Engineering - 4.0.4-7.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild