summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2012-07-22 15:49:25 +0300
committerVille Skyttä <ville.skytta@iki.fi>2012-07-22 15:49:25 +0300
commitad53fff5260af9820b4703727073550e4987842d (patch)
treebcc8e6a5762dc15799110b0c23f9e8e67d2d3486
parentc68cd8317c9bd17aab2b85f18be02290dd2adcb4 (diff)
downloadgnome-panel-ad53fff5260af9820b4703727073550e4987842d.tar.gz
gnome-panel-ad53fff5260af9820b4703727073550e4987842d.tar.xz
gnome-panel-ad53fff5260af9820b4703727073550e4987842d.zip
Move post(un)install ldconfig scriptlets from main to -libs.
- Escape macros in %changelog.
-rw-r--r--gnome-panel.spec17
1 files changed, 11 insertions, 6 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index b8c5fce..a20cf06 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -21,7 +21,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 3.5.4
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.gnome.org
#VCS: git:git://git.gnome.org/gnome-panel
Source0: http://download.gnome.org/sources/gnome-panel/3.5/%{name}-%{version}.tar.xz
@@ -195,10 +195,8 @@ desktop-file-install --delete-original \
%post
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-/sbin/ldconfig
%postun
-/sbin/ldconfig
if [ $1 -eq 0 ]; then
touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
@@ -209,6 +207,9 @@ fi
gtk-update-icon-cache -q %{_datadir}/icons/hicolor >&/dev/null || :
glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
%files -f %{gettext_package}.lang
%doc AUTHORS COPYING COPYING.LIB COPYING-DOCS NEWS README
@@ -254,6 +255,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
%{_datadir}/gir-1.0/PanelApplet-4.0.gir
%changelog
+* Sun Jul 22 2012 Ville Skyttä <ville.skytta@iki.fi> - 3.5.4-2
+- Move post(un)install ldconfig scriptlets from main to -libs.
+- Escape macros in %%changelog.
+
* Wed Jul 18 2012 Matthias Clasen <mclasen@redhat.com> - 3.5.4-1
- Update to 3.5.4
@@ -598,7 +603,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
- Update to 2.25.5
* Fri Jan 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.3-4
-- And don't write %s into desktop files
+- And don't write %%s into desktop files
* Fri Jan 16 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.3-3
- Fix the 'smart launcher' patch
@@ -1307,7 +1312,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
command (rh #152948)
* Mon Apr 18 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-2
-- Add the battery applet to the panel in %post if ACPI is
+- Add the battery applet to the panel in %%post if ACPI is
available (bug #143828)
* Mon Apr 4 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-1
@@ -1440,7 +1445,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas >&/dev/null || :
it doesn't seem like we've forgotten panel-compatibility.schemas
* Thu Apr 8 2004 Mark McLoughlin <markmc@redhat.com> 2.6.0-5
-- Fix problem with apm detection in %post on machines whose
+- Fix problem with apm detection in %%post on machines whose
APM bios doesn't have battery lifetime support
* Wed Apr 7 2004 Mark McLoughlin <markmc@redhat.com> - 2.6.0-4