[xword] update desktop/icon/mime scriptlets, remove empty %clean section

Rex Dieter rdieter at fedoraproject.org
Thu Oct 2 22:53:37 UTC 2014


commit dbaef048ac3b7dbb7bb9f260c69359f68966bcab
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 2 17:53:30 2014 -0500

    update desktop/icon/mime scriptlets, remove empty %clean section

 xword.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/xword.spec b/xword.spec
index 7a35040..184cbb9 100644
--- a/xword.spec
+++ b/xword.spec
@@ -1,6 +1,6 @@
 Name:		xword
 Version:	1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Reads and writes crossword puzzles in the Across Lite file format
 
 
@@ -68,20 +68,22 @@ install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
 install -p -m 644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages/
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+fi
 update-desktop-database &> /dev/null || :
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
-
-%clean
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files
 %doc LICENSE
@@ -89,12 +91,15 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/icons/hicolor/24x24/apps/xword.png
 %{_datadir}/applications/%{name}.desktop
 %{_bindir}/*
-%{_datadir}/mime/packages/*
+%{_datadir}/mime/packages/*.xml
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> 1.0-6
+- update desktop/icon/mime scriptlets, remove empty %%clean section
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list