[nip2] 7.40.4-2

[Rex Dieter]

commit d2be11320eba98bd9393a01e74ded15fade72c9d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Nov 26 08:46:49 2014 -0600

    7.40.4-2
    
    - rebuild (vips)
    - fix icon/mime scriptlets
    - validate appdata

 nip2.spec |   37 ++++++++++++++++++++++++-------------
 1 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/nip2.spec b/nip2.spec
index b0f39e1..5baac98 100644
--- a/nip2.spec
+++ b/nip2.spec
@@ -3,7 +3,7 @@
 
 Name:		nip2
 Version:	%{nip2_version}
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
@@ -24,6 +24,7 @@ BuildRequires:	pkgconfig(libgsf-1)
 BuildRequires:	shared-mime-info gnome-icon-theme-devel
 BuildRequires:	flex bison intltool gettext
 BuildRequires:	desktop-file-utils xdg-utils
+BuildRequires:	libappstream-glib
 
 
 # description taken from Debian package
@@ -62,36 +63,41 @@ install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
 cp -a share/nip2/data/vips-128.png	\
 	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps/nip2.png
 
+
+%check
+appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/appdata/nip2.appdata.xml
 # desktop file
-desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nip2.desktop
 
 
 %post
 # scriptlet for icons
 touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 # scriptlet for desktop database
 update-desktop-database &> /dev/null || :
 
 # MIME
-update-mime-database %{_datadir}/mime &> /dev/null || :
-
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
+if [ $1 -eq 0 ] ; then
 # scriptlet for icons
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+# MIME
+touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
 # scriptlet for desktop database
 update-desktop-database &> /dev/null || :
 
+%posttrans
+# scriptlet for icons
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 # MIME
-update-mime-database %{_datadir}/mime &> /dev/null || :
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %files -f nip2.lang
@@ -101,12 +107,17 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 %{_datadir}/nip2
 %{_mandir}/man1/nip2.1.gz
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/appdata/*
-%{_datadir}/applications/*
+%{_datadir}/appdata/nip2.appdata.xml
+%{_datadir}/applications/nip2.desktop
 %{_datadir}/mime/packages/nip2.xml
 
 
 %changelog
+* Wed Nov 26 2014 Rex Dieter <rdieter at fedoraproject.org> - 7.40.4-2
+- rebuild (vips)
+- fix icon/mime scriptlets
+- validate appdata
+
 * Thu Sep 25 2014 Benjamin Gilbert <bgilbert at backtick.net> - 7.40.4-1
 - New release