[mate-desktop] update to 1.5.1 release

[leigh123linux]

commit 4908f884bd38a0cfde21a396fc2fca5980448096
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 10:14:58 2012 +0000

    update to 1.5.1 release

 ...e-double-free-when-destroying-private-win.patch |   38 -------
 ...-Don-t-read-past-the-end-of-a-string-mate.patch |   11 --
 mate-desktop.spec                                  |  105 +++++++++++---------
 3 files changed, 59 insertions(+), 95 deletions(-)
---
diff --git a/mate-desktop.spec b/mate-desktop.spec
index 8163ac8..c6cfe31 100644
--- a/mate-desktop.spec
+++ b/mate-desktop.spec
@@ -1,25 +1,23 @@
-Summary:	Shared code among gnome-panel, gnome-session, nautilus, etc
-Name:		mate-desktop
-Version:	1.4.1
-Release:	12%{?dist}
-URL:		http://mate-desktop.org
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-License:    GPLv2+ and LGPLv2+ and MIT
-Group:		System Environment/Libraries
-
-BuildRequires: mate-common
-BuildRequires: mate-conf-devel
-BuildRequires: startup-notification-devel
-BuildRequires: mate-doc-utils
-BuildRequires: unique-devel
-BuildRequires: desktop-file-utils
-
-Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
-Requires:	redhat-menus
-Requires:	pygtk2
-#To avoid confusion with the packagegroup and make sure this package pulls all the runtime requirements
-Requires:	mate-window-manager mate-session-manager libmateweather mate-corba mate-conf mate-control-center mate-settings-daemon
+Summary:        Shared code for mate-panel, mate-session, mate-file-manager, etc
+Name:           mate-desktop
+Version:        1.5.1
+Release:        1%{?dist}
+URL:            http://mate-desktop.org
+Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+
+License:        GPLv2+ and LGPLv2+ and MIT
+Group:          System Environment/Libraries
+
+BuildRequires:  mate-common
+BuildRequires:  pkgconfig(libstartup-notification-1.0)
+BuildRequires:  pkgconfig(mate-doc-utils)
+BuildRequires:  pkgconfig(unique-1.0)
+BuildRequires:  desktop-file-utils
+
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       redhat-menus
+Requires:       pygtk2
+
 
 %description
 The mate-desktop package contains an internal library
@@ -28,18 +26,18 @@ desktop, and also some data files and other shared components of the
 MATE user environment.
 
 %package libs
-Summary: Shared libraries for libmate-desktop
-License: LGPLv2+
-Group: System Environment/Libraries
+Summary:  Shared libraries for libmate-desktop
+License:  LGPLv2+
+Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 
 %description libs
 Shared libraries for libmate-desktop
 
 %package devel
-Summary: Libraries and headers for libmate-desktop
-License: LGPLv2+
-Group: Development/Libraries
+Summary:  Libraries and headers for libmate-desktop
+License:  LGPLv2+
+Group:    Development/Libraries
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
@@ -54,12 +52,12 @@ NOCONFIGURE=1 ./autogen.sh
 %build
 
 %configure \
-	--disable-libtool-lock	\
-	--disable-scrollkeeper	\
-	--disable-static	\
-	--with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids"	\
-	--enable-unique	\
-	--enable-gtk-doc
+        --disable-libtool-lock \
+        --disable-scrollkeeper \
+        --disable-static \
+        --with-pnp-ids-path="%{_datadir}/hwdata/pnp.ids" \
+        --enable-unique \
+        --enable-gtk-doc
 
 make %{?_smp_mflags} V=1
 
@@ -68,14 +66,11 @@ make %{?_smp_mflags} V=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
-# stuff we don't want
-#rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 # to avoid conflicts with gnome
 mkdir $RPM_BUILD_ROOT%{_datadir}/omf/mate
 mv -f $RPM_BUILD_ROOT%{_datadir}/omf/{fdl,gpl,lgpl} $RPM_BUILD_ROOT%{_datadir}/omf/mate
 
-%find_lang %{name} --all-name
 
 desktop-file-install \
   --remove-category="MATE" \
@@ -84,33 +79,51 @@ desktop-file-install \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   $RPM_BUILD_ROOT%{_datadir}/applications/mate-about.desktop
 
+%find_lang %{name} --with-gnome
+
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+
+%postun
+if [ $1 -eq 0 ] ; then
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+
+%posttrans
+    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING COPYING.LIB NEWS README
-%{_datadir}/applications/mate-about.desktop
-%doc %{_mandir}/man1/mate-about.1*
-# GPL
 %{_bindir}/mate-about
-# LGPL
+%{_datadir}/applications/mate-about.desktop
 %{_datadir}/mate/help/*/*/*.xml
 %{_datadir}/omf/mate/
 %{_datadir}/mate-about/
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
+%{_datadir}/pixmaps/gnu-cat*.*
+%{_datadir}/glib-2.0/schemas/org.mate.*.gschema.xml
+%{_mandir}/man1/mate-about.1*
 
 %files libs
-# LGPL
 %{_libdir}/libmate-desktop-2.so.*
 
 %files devel
+%doc %{_datadir}/gtk-doc/html/mate-desktop/
 %{_libdir}/libmate-desktop-2.so
 %{_libdir}/pkgconfig/mate-desktop-2.0.pc
 %{_includedir}/mate-desktop-2.0/
-%doc %{_datadir}/gtk-doc/html/mate-desktop
 
 
 %changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.1-1
+- update to 1.5.1 release
+- remove all the false mate requires (breached package guidelines)
+- remove unused build require and change style
+- add schema scriptlets
+- clean up spec file
+- fix Summary
+
 * Wed Oct 17 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.1-12
 - Add runtime requirements to avoid confusion