[mate-power-manager] update to 1.5.0 release

[leigh123linux]

commit b4061c83055bf20251a7e8da8a884eac368b6478
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Nov 8 19:52:25 2012 +0000

    update to 1.5.0 release

 .gitignore              |    1 +
 mate-power-manager.spec |   38 +++++++++++---------------------------
 sources                 |    2 +-
 3 files changed, 13 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d2fb980..3bce71d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /mate-power-manager-1.4.0.tar.xz
 /mate-power-manager-1.4.1.git543b06f.tar.gz
+/mate-power-manager-1.5.0.tar.xz
diff --git a/mate-power-manager.spec b/mate-power-manager.spec
index 0a14984..d84fda2 100644
--- a/mate-power-manager.spec
+++ b/mate-power-manager.spec
@@ -1,18 +1,12 @@
-%global        _internal_version  543b06f
-
 Name:           mate-power-manager
-Version:        1.4.1
-Release:        0.1.git543b06f%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        MATE power management service
 
 License:        GPLv2+
 URL:            http://pub.mate-desktop.org
-# To generate tarball
-# wget https://github.com/mate-desktop/mate-power-manager/tarball/%%{_internal_version} -O mate-power-manager-1.4.1.git%%{_internal_version}.tar.gz
-Source0:        http://leigh123linux.fedorapeople.org/pub/mate-power-manager/source/mate-power-manager-%{version}.git%{_internal_version}.tar.gz
-#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
 
-Patch0:         panelapplet_versionfix.patch 
 
 BuildRequires: mate-panel-devel
 BuildRequires: popt-devel
@@ -25,7 +19,6 @@ BuildRequires: upower-devel
 BuildRequires: unique-devel
 BuildRequires: glib2-devel
 BuildRequires: rarian-compat
-BuildRequires: mate-conf-devel
 BuildRequires: gtk2-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: mate-control-center-devel
@@ -33,10 +26,6 @@ BuildRequires: mate-common
 BuildRequires: mate-keyring-devel
 
 Requires: dbus-x11
-
-Requires(pre): mate-conf
-Requires(preun): mate-conf
-Requires(post): mate-conf
        
 
 %description
@@ -44,8 +33,7 @@ MATE Power Manager uses the information and facilities provided by UPower
 displaying icons and handling user callbacks in an interactive MATE session.
 
 %prep
-%setup -q -n mate-desktop-%{name}-%{_internal_version}
-%patch0 -p1
+%setup -q
 NOCONFIGURE=1 ./autogen.sh
 
 
@@ -59,9 +47,7 @@ make V=1 %{?_smp_mflags}
 
 
 %install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-install --delete-original             \
   --remove-category=MATE                           \
@@ -74,30 +60,24 @@ desktop-file-install --delete-original             \
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%mateconf_schema_upgrade mate-power-manager
-
-
-%pre
-%mateconf_schema_prepare mate-power-manager
-
-%preun
-%mateconf_schema_remove mate-power-manager
 
 %postun
 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
 
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 
 
 %files  -f %{name}.lang
 %doc AUTHORS COPYING README
 %{_bindir}/*
 %{_sbindir}/*
-%{_sysconfdir}/mateconf/schemas/mate-*.schemas
 %{_sysconfdir}/xdg/autostart/mate-*.desktop
 %{_datadir}/applications/mate-*.desktop
 %{_datadir}/dbus-1/services/*.service
@@ -109,12 +89,16 @@ fi
 %{_datadir}/mate-2.0/ui/inhibit-applet-menu.xml
 %{_datadir}/mate-panel/applets/org.mate.BrightnessApplet.mate-panel-applet
 %{_datadir}/mate-panel/applets/org.mate.InhibitApplet.mate-panel-applet
+%{_datadir}/glib-2.0/schemas/org.mate.power-manager.gschema.xml
 %{_libexecdir}/mate-brightness-applet
 %{_libexecdir}/mate-inhibit-applet
 %{_mandir}/man1/*.1.*
 
 
 %changelog
+* Thu Nov 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
+- update to 1.5.0 release
+
 * Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.1-0.1.git543b06f
 - update to latest git snapshot
 - patch to build against latest mate-panel
diff --git a/sources b/sources
index cea44c6..db57929 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0d69981ca264b1d783efc27c2ea3d81  mate-power-manager-1.4.1.git543b06f.tar.gz
+167d283d16475824c175615396ce4265  mate-power-manager-1.5.0.tar.xz