[mate-panel/f18] set panel-default-setup.entries

[leigh123linux]

commit 081183a45db538b19f320bbe5a7eedce1a0ecd08
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Oct 10 16:12:04 2012 +0100

    set panel-default-setup.entries

 mate-panel.spec |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index d7e427a..e4f6dd4 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -3,7 +3,7 @@
 
 Name:	mate-panel
 Version:	1.4.0
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	MATE Desktop panel applets
 #libs are LGPLv2+ applications GPLv2+
 License:	LGPLv2+ and GPLv2+
@@ -57,12 +57,6 @@ make  %{?_smp_mflags} V=1
 export MATECONF_DISABLE_MAKE_FILE_SCHEMA INSTALL=1
 make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
 
-# ugly hack... we need this fixed!
-if [ -f %{buildroot}%{_sysconfdir}/mateconf/schemas/panel-default-setup.entries ]; then
-   mkdir -p %{buildroot}%{_datadir}/mateconf/schemas/
-   mv %{buildroot}%{_sysconfdir}/mateconf/schemas/panel-default-setup.entries \
-      %{buildroot}%{_datadir}/mateconf/schemas/panel-default-setup.entries
-fi
 
 
 %find_lang %{name}
@@ -88,8 +82,19 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/mate-panel.desktop
 /sbin/ldconfig
 /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 update-desktop-database &> /dev/null || :
+
+# Clear out the old defaults
+export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
+mateconftool-2 --direct --config-source=$MATECONF_CONFIG_SOURCE --recursive-unset /apps/panel > /dev/null || :
+mateconftool-2 --direct --config-source=$MATECONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel > /dev/null || :
+
 %mateconf_schema_upgrade %{schemas}
 
+# Install the default setup into /apps/panel and /apps/panel/default_setup
+export MATECONF_CONFIG_SOURCE=`mateconftool-2 --get-default-source`
+mateconftool-2 --direct --config-source=$MATECONF_CONFIG_SOURCE --load %{_sysconfdir}/mateconf/schemas/panel-default-setup.entries > /dev/null || :
+mateconftool-2 --direct --config-source=$MATECONF_CONFIG_SOURCE --load %{_sysconfdir}/mateconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || :
+
 
 %preun
 %mateconf_schema_remove %{schemas}
@@ -112,7 +117,7 @@ update-desktop-database &> /dev/null || :
 %{_sysconfdir}/mateconf/schemas/clock.schemas
 %{_sysconfdir}/mateconf/schemas/fish.schemas
 %{_sysconfdir}/mateconf/schemas/panel-compatibility.schemas
-%{_datadir}/mateconf/schemas/panel-default-setup.entries
+%{_sysconfdir}/mateconf/schemas/panel-default-setup.entries
 %{_sysconfdir}/mateconf/schemas/panel-general.schemas
 %{_sysconfdir}/mateconf/schemas/panel-global.schemas
 %{_sysconfdir}/mateconf/schemas/panel-object.schemas
@@ -159,6 +164,10 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtk-doc/html/mate-panel-applet/
 
 %changelog
+* Wed Oct 10 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-10
+- remove ugly hack
+- set panel-default-setup.entries
+
 * Sun Oct 07 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-9
 - Change %%define to %%global
 - Tidy up schema scriplets