[gnome-nettool] Update scriptlets

Matthias Clasen mclasen at fedoraproject.org
Tue Jan 11 13:35:06 UTC 2011


commit c8be6d12380f9f2cfdc8b8c681781f98207b09b0
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Jan 11 08:34:53 2011 -0500

    Update scriptlets

 gnome-nettool.spec |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/gnome-nettool.spec b/gnome-nettool.spec
index d9b09b3..b21a428 100644
--- a/gnome-nettool.spec
+++ b/gnome-nettool.spec
@@ -34,7 +34,7 @@ tools, like ping, netstat, ifconfig, whois, traceroute, finger.
 make
 
 %install
-%makeinstall
+make install DESTDIR="$RPM_BUILD_ROOT"
 
 desktop-file-install --vendor gnome --delete-original                   \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
@@ -48,28 +48,32 @@ desktop-file-install --vendor gnome --delete-original                   \
 
 %post
 update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %postun
 update-desktop-database -q
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_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 || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/gnome-nettool
-%{_datadir}/omf/gnome-nettool
 %{_datadir}/icons/hicolor/*/apps/gnome-nettool.png
 %{_datadir}/icons/hicolor/scalable/apps/gnome-nettool.svg
 %{_datadir}/applications/*.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-nettool.gschema.xml
 
 %changelog
 * Tue Jan 11 2011 Matthias Clasen <mclasen at redhat.com> - 2.91.5-1


More information about the scm-commits mailing list