spec fixesgnome-panel-2_16_0-3_fc6

1 files changed, 47 insertions, 6 deletions

diff --git a/gnome-panel.spec b/gnome-panel.spec
index 4589e7d..17337e7 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -20,7 +20,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.16.0
-Release: 2%{?dist} 
+Release: 3%{?dist} 
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -41,6 +41,11 @@ Prereq: /bin/awk, /bin/cat, /bin/ln, /bin/rm
 Prereq: GConf2 >= 2.6.0-2
 Prereq: scrollkeeper
 Prereq: gtk2 >= %{gtk2_version}
+Requires(post): GConf2
+Requires(post): scrollkeeper
+Requires(post): hicolor-icon-theme
+Requires(preun): GConf2
+Requires(postun): scrollkeeper
 
 BuildRequires: which
 BuildRequires: libxml2-python
@@ -181,10 +186,19 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /sch
 #
 # Install the schemas
 #
-SCHEMAS="clock.schemas fish.schemas pager.schemas panel-compatibility.schemas panel-general.schemas panel-global.schemas panel-object.schemas panel-toplevel.schemas tasklist.schemas window-list.schemas workspace-switcher.schemas"
-for S in $SCHEMAS; do
-  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
-done
+gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
+	%{_sysconfdir}/gconf/schemas/fish.schemas \
+	%{_sysconfdir}/gconf/schemas/pager.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-general.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-global.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-object.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
+	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
+	%{_sysconfdir}/gconf/schemas/window-list.schemas \
+	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
+  > /dev/null
 
 #
 # Install the default setup into /apps/panel and /apps/panel/default_setup
@@ -194,6 +208,24 @@ gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/
 
 /sbin/ldconfig
 
+%preun
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/clock.schemas \
+	%{_sysconfdir}/gconf/schemas/fish.schemas \
+	%{_sysconfdir}/gconf/schemas/pager.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-compatibility.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-general.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-global.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-object.schemas \
+	%{_sysconfdir}/gconf/schemas/panel-toplevel.schemas \
+	%{_sysconfdir}/gconf/schemas/tasklist.schemas \
+	%{_sysconfdir}/gconf/schemas/window-list.schemas \
+	%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas \
+  > /dev/null
+fi
+
 %postun
 /sbin/ldconfig
 touch --no-create %{_datadir}/icons/hicolor
@@ -206,7 +238,11 @@ fi
 
 %doc AUTHORS COPYING ChangeLog NEWS README
 
-%{_datadir}/icons
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_datadir}/icons/hicolor/24x24/apps/*
+%{_datadir}/icons/hicolor/32x32/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 %{_datadir}/gnome/panel
 %{_datadir}/gnome/help/*
 %{_datadir}/gnome-panelrc
@@ -232,6 +268,11 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Tue Sep 19 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-3.fc6
+- Fix some directory ownership issues
+- Add a %%preun to uninstall gconf schemas
+- Require hicolor-icon-theme (#204237)
+
 * Mon Sep 18 2006 Soren Sandmann <sandmann@redhat.com> - 2.16.0-2.fc6
 - Add patch to make the pager preference box deal with viewports when compiz
   is running. (Bug 205905).