[mate-panel] update to 1.5.1 release

[leigh123linux]

commit 05b207fdc4b854a8934e49c6cd459dd21ca7614d
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 12:49:53 2012 +0000

    update to 1.5.1 release

 mate-panel.spec |   99 +++++++++++++++---------------------------------------
 1 files changed, 28 insertions(+), 71 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index 64064ea..01efe3b 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -1,14 +1,11 @@
-%global po_package %{name}
-%global schemas clock fish panel-compatibility panel-general panel-object panel-toplevel window-list workspace-switcher
-
 Name:     mate-panel
-Version:  1.4.0
-Release:  12%{?dist}
+Version:  1.5.1
+Release:  1%{?dist}
 Summary:  MATE Desktop panel applets
 #libs are LGPLv2+ applications GPLv2+
 License:  LGPLv2+ and GPLv2+
 URL:      http://mate-desktop.org
-Source0:  http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Source0:  http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 
 BuildRequires: pkgconfig(libnm-gtk)
 Buildrequires: pkgconfig(dbus-glib-1)
@@ -23,23 +20,19 @@ Buildrequires: pkgconfig(mateweather)
 Buildrequires: pkgconfig(libmatewnck)
 Buildrequires: pkgconfig(librsvg-2.0)
 Buildrequires: pkgconfig(x11)
-Buildrequires: pkgconfig(mateconf-2.0)
+Buildrequires: pkgconfig(dconf)
+BuildRequires: pkgconfig(gsettings-desktop-schemas)
 Buildrequires: pkgconfig(MateCORBA-2.0)
 Buildrequires: pkgconfig(mate-desktop-2.0)
 Buildrequires: pkgconfig(mate-doc-utils)
 Buildrequires: pkgconfig(libmate-menu)
 Buildrequires: pkgconfig(pango)
 Buildrequires: popt-devel
-Buildrequires: mate-conf-gtk
 Buildrequires: mate-common
 Buildrequires: icon-naming-utils
 Buildrequires: desktop-file-utils
 
-#Will fix evolution support in a future release
-#BuildRequires: evolution-data-server-devel
-Requires(pre):  mate-conf
-Requires(post): mate-conf
-Requires(preun): mate-conf
+Requires:   gsettings-desktop-schemas
 
 # needed as nothing else requires it
 Requires: mate-session-manager
@@ -69,13 +62,10 @@ NOCONFIGURE=1 ./autogen.sh
            --with-x \
            --enable-network-manager \
            --libexecdir=%{_libexecdir}/mate-panel \
-           --enable-matecomponent \
-           --disable-schemas-install \
            --enable-introspection
 make  %{?_smp_mflags} V=1
 
 %install
-export MATECONF_DISABLE_MAKE_FILE_SCHEMA INSTALL=1
 make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
 
 
@@ -91,95 +81,62 @@ desktop-file-install                                          \
 
 %find_lang %{name}
 
-%pre
-%mateconf_schema_prepare %{schemas}
 
 %post
 /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}
-
 
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 update-desktop-database &> /dev/null || :
 
 %posttrans
 /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{po_package}.lang
 %doc AUTHORS COPYING README
 %{_mandir}/man1/*
-%{_sysconfdir}/mateconf/schemas/clock.schemas
-%{_sysconfdir}/mateconf/schemas/fish.schemas
-%{_sysconfdir}/mateconf/schemas/panel-compatibility.schemas
-%{_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
-%{_sysconfdir}/mateconf/schemas/panel-toplevel.schemas
-%{_sysconfdir}/mateconf/schemas/window-list.schemas
-%{_sysconfdir}/mateconf/schemas/workspace-switcher.schemas
 %{_bindir}/mate-desktop-item-edit
 %{_bindir}/mate-panel
 %{_bindir}/mate-panel-test-applets
-%{_bindir}/panel-test-applets-matecomponent
-%{_datadir}/idl/mate-panel-2.0/MATE_Panel.idl
-%{_datadir}/mate-2.0/ui/MATE_Panel_Popup.xml
-%{_libdir}/libmate-panel-applet-2.so.1
-%{_libdir}/libmate-panel-applet-2.so.1.0.1
-%{_libdir}/girepository-1.0/MatePanelApplet-3.0.typelib
-%{_libdir}/libmate-panel-applet-3.so.1
-%{_libdir}/libmate-panel-applet-3.so.1.0.1
-%{_libexecdir}/mate-panel
+%{_libdir}/libmate-panel-applet-*.so.*
+%{_libdir}/girepository-1.0/MatePanelApplet-*.0.typelib
+%{_libexecdir}/mate-panel/
+%{_datadir}/glib-2.0/schemas/org.mate.panel.*.xml
 %{_datadir}/applications/mate-panel.desktop
-%{_datadir}/dbus-1/services/org.mate.panel.applet.ClockAppletFactory.service
-%{_datadir}/dbus-1/services/org.mate.panel.applet.FishAppletFactory.service
-%{_datadir}/dbus-1/services/org.mate.panel.applet.NotificationAreaAppletFactory.service
-%{_datadir}/dbus-1/services/org.mate.panel.applet.WnckletFactory.service
-%{_datadir}/gir-1.0/MatePanelApplet-3.0.gir
+%{_datadir}/dbus-1/services/org.mate.panel.*.service
 %{_datadir}/omf/mate-applet-fish/
 %{_datadir}/omf/mate-applet-clock/
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mate/help/mate-applet-clock
-%{_datadir}/mate/help/mate-applet-fish
-%{_datadir}/mate-panel
+%{_datadir}/mate/help/mate-applet-clock/
+%{_datadir}/mate/help/mate-applet-fish/
+%{_datadir}/mate-panel/
 %{_datadir}/mate-panelrc
 
 %files devel
-%{_libdir}/libmate-panel-applet-3.so
-%{_includedir}/mate-panel-3.0/
-%{_libdir}/pkgconfig/libmatepanelapplet-3.0.pc
-%{_includedir}/panel-2.0/MATE_Panel.h
-%{_includedir}/panel-2.0/mate-panel-applet-enums.h
-%{_includedir}/panel-2.0/mate-panel-applet-mateconf.h
-%{_includedir}/panel-2.0/mate-panel-applet.h
-%{_libdir}/libmate-panel-applet-2.so
-%{_libdir}/mate-panel/modules/libmate-panel-applets-matecomponent.so
-%{_libdir}/pkgconfig/libmatepanelapplet-2.0.pc
+%{_includedir}/mate-panel-*.0/
+%{_libdir}/libmate-panel-applet-*.so
+%{_libdir}/pkgconfig/libmatepanelapplet-*.0.pc
+%{_datadir}/gir-1.0/MatePanelApplet-*.0.gir
 %{_datadir}/gtk-doc/html/mate-panel-applet/
 
 %changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.1-1
+- update to 1.5.1 release
+- add schema scriptlets and remove mateconf scriptlets
+- add requires gsettings-desktop-schemas
+- add build requires gsettings-desktop-schemas-devel and dconf-devel
+- move .gir file to devel package
+- clean up spec file
+
 * Mon Oct 22 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-12
 - Remove un-needed %%check section