[alacarte] Require gnome-panel (#684927) Compile with %{?_smp_mflags} Update icon-cache scriptlets

[Christoph Wickert]

commit 8de7d3dcc0c6ad8f0c6cd3700ca2cae6ac6af763
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Mar 14 21:33:44 2011 +0100

    Require gnome-panel (#684927)
    Compile with %{?_smp_mflags}
    Update icon-cache scriptlets

 alacarte.spec |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/alacarte.spec b/alacarte.spec
index 89fab1f..e0e6be6 100644
--- a/alacarte.spec
+++ b/alacarte.spec
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.13.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -22,6 +22,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  autoconf
 Requires:       pygtk2, gnome-python2-gconf
 Requires:       gnome-menus >= 2.27.92
+Requires:       gnome-panel
 
 Patch0:         undo-delete.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=612895
@@ -42,11 +43,11 @@ autoreconf
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # desktop-file-install can't manipulate NotShowIn
 sed -i -e 's/NotShowIn=KDE;/OnlyShowIn=GNOME;/' \
@@ -61,17 +62,17 @@ desktop-file-validate \
 rm -rf $RPM_BUILD_ROOT
 
 %post
-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
-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 || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING
@@ -87,6 +88,11 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
+* Mon Mar 14 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.13.2-3
+- Require gnome-panel (#684927)
+- Compile with %%{?_smp_mflags}
+- Update icon-cache scriptlets
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.13.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild