[mate-session-manager] update to 1.5.0 release

[leigh123linux]

commit 0430c4068c9c509db14938c0bb82c41579d6e21d
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 19:18:11 2012 +0000

    update to 1.5.0 release

 .gitignore                |    1 +
 mate-session-manager.spec |   92 ++++++++++++++++++++++++--------------------
 sources                   |    2 +-
 3 files changed, 52 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f2c8d4..1302e53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mate-session-manager-1.4.0.tar.xz
+/mate-session-manager-1.5.0.tar.xz
diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 8be1fa7..3a6a04b 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -1,15 +1,24 @@
-Name:	mate-session-manager
-Version:	1.4.0
-Release:	9%{?dist}
-Summary:	MATE Desktop session manager
-License:	GPLv2+
-URL:		http://mate-desktop.org
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-BuildRequires:	mate-conf-devel desktop-file-utils mate-conf-gtk mate-conf gtk2-devel dbus-glib-devel mate-common gstreamer-plugins-base-devel libSM-devel upower-devel mate-polkit-devel mate-icon-theme icon-naming-utils polkit-devel
-Requires(pre):	mate-conf
-Requires(post):	mate-conf
-Requires(preun):	mate-conf
+Name:           mate-session-manager
+Version:        1.5.0
+Release:        1%{?dist}
+Summary:        MATE Desktop session manager
+License:        GPLv2+
+URL:            http://mate-desktop.org
+Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(dbus-glib-1)
+BuildRequires:  mate-common
+BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(upower-glib)
+BuildRequires:  pkgconfig(polkit-gtk-mate-1)
+BuildRequires:  mate-icon-theme
+BuildRequires:  icon-naming-utils
+BuildRequires:  pkgconfig(polkit-agent-1)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+
+Requires:       gsettings-desktop-schemas
 
 %description
 MATE Desktop session manager
@@ -19,71 +28,70 @@ MATE Desktop session manager
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure --disable-static --disable-schemas-install --enable-ipv6 --with-gtk=2.0 --with-gnu-ld --with-default-wm=marco --with-x
+%configure --disable-static \
+           --enable-ipv6 \
+           --with-gtk=2.0 \
+           --with-gnu-ld \
+           --with-default-wm=marco \
+           --with-x
 make %{?_smp_mflags} V=1
 
 
 %install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-%find_lang %{name}
-	desktop-file-install								\
-	--remove-category="MATE"							\
-	--add-category="X-Mate"								\
-	--delete-original								\
-	--dir=%{buildroot}%{_datadir}/applications					\
+
+desktop-file-install                               \
+        --remove-category="MATE"                   \
+        --add-category="X-Mate"                    \
+        --delete-original                          \
+        --dir=%{buildroot}%{_datadir}/applications \
 %{buildroot}%{_datadir}/applications/mate-session-properties.desktop
-	desktop-file-install								\
-	--remove-category="MATE"							\
-	--add-category="X-Mate"								\
-	--delete-original								\
-	--dir=%{buildroot}%{_datadir}/xsessions						\
-%{buildroot}%{_datadir}/xsessions/mate.desktop
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/mate-session-properties.desktop
 
-%pre
-%mateconf_schema_prepare mate-session
+%find_lang %{name}
+
 
-%preun
-%mateconf_schema_remove mate-session
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
-%mateconf_schema_upgrade mate-session
+
 
 
 %postun
 if [ $1 -eq 0 ] ; then
-	/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
-	/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
+      /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+      /usr/bin/gtk-update-icon-cache -f %{_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 -f %{_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
+%doc %{_datadir}/doc/mate-session/dbus/mate-session.html
 %{_mandir}/man1/*
 %{_bindir}/mate-session
 %{_bindir}/mate-session-properties
 %{_bindir}/mate-session-save
 %{_bindir}/mate-wm
-%{_sysconfdir}/mateconf/schemas/mate-session.schemas
 %{_datadir}/applications/mate-session-properties.desktop
 %{_datadir}/mate-session/
-%{_datadir}/icons/hicolor/16x16/apps/*.png
-%{_datadir}/icons/hicolor/22x22/apps/*.png
-%{_datadir}/icons/hicolor/24x24/apps/*.png
-%{_datadir}/icons/hicolor/32x32/apps/*.png
-%{_datadir}/icons/hicolor/48x48/apps/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/icons/hicolor/scalable/apps/mate-session-properties.svg
+%{_datadir}/glib-2.0/schemas/org.mate.session.gschema.xml
 %{_datadir}/xsessions/mate.desktop
 
 %changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
+- update to 1.5.0 release
+- add requires gsettings-desktop-schemas
+- add build requires gsettings-desktop-schemas-devel
+- remove the desktop validate for the xsession file
+- change build requires style
+
 * Wed Oct 17 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.0-9
 - Add mate.desktop to desktop-file-install
 
diff --git a/sources b/sources
index 1adbbb6..5b336e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cac7ef39b72c814f549fa6f1f84a58d  mate-session-manager-1.4.0.tar.xz
+64090402b0df99f874ca1cb2cc499745  mate-session-manager-1.5.0.tar.xz