[xournal] update desktop/icon/mime scriptlets, move autogen to %prep

[Rex Dieter]

commit 8c54a2b1cf4be0cd57377b1d9566e6b0d5fb89fa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Oct 2 17:56:16 2014 -0500

    update desktop/icon/mime scriptlets, move autogen to %prep

 xournal.spec |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/xournal.spec b/xournal.spec
index 6018c86..ba59612 100644
--- a/xournal.spec
+++ b/xournal.spec
@@ -1,6 +1,6 @@
 Name:		xournal
 Version:	0.4.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Notetaking, sketching, PDF annotation and general journal
 
 Group:		Applications/Editors
@@ -35,8 +35,9 @@ resolution) and overall functionality.
 %prep
 %setup -q
 
-%build
 NOCONFIGURE=1 ./autogen.sh
+
+%build
 CFLAGS="%optflags -DPACKAGE_LOCALE_DIR=\\\"\"%{_datadir}/locale\"\\\" -DPACKAGE_DATA_DIR=\\\"\"%{_datadir}\"\\\"" %configure
 %{__make} %{?_smp_mflags}
 
@@ -73,17 +74,22 @@ desktop-file-install \
 %find_lang %{name}
 
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
+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 || :
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files -f %{name}.lang
 %{_bindir}/xournal
@@ -98,8 +104,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %doc AUTHORS ChangeLog COPYING
 
 
-
 %changelog
+* Thu Oct 02 2014 Rex Dieter <rdieter at fedoraproject.org> 0.4.8-3
+- update desktop/icon/mime scriptlets, move autogen to %%prep
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild