[mate-notification-daemon] update to 1.5.0 release

[leigh123linux]

commit 25d8e37ddbe822bd15b4379d71e1c6cab787c763
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Oct 30 10:14:45 2012 +0000

    update to 1.5.0 release

 .gitignore                    |    1 +
 mate-notification-daemon.spec |   83 +++++++++++++++++++++++-----------------
 sources                       |    2 +-
 3 files changed, 50 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f601638..594c513 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mate-notification-daemon-1.4.0.tar.xz
+/mate-notification-daemon-1.5.0.tar.xz
diff --git a/mate-notification-daemon.spec b/mate-notification-daemon.spec
index aaabb41..9c481cb 100644
--- a/mate-notification-daemon.spec
+++ b/mate-notification-daemon.spec
@@ -1,16 +1,24 @@
-Name:	mate-notification-daemon
-Version:	1.4.0
-Release:	9%{?dist}
-Summary:	Notification daemon for MATE Desktop
-License:	GPLv2+
-URL:		http://mate-desktop.org
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-BuildRequires:	desktop-file-utils dbus-glib-devel mate-conf-devel mate-conf mate-desktop-devel mate-corba-devel libcanberra-devel libmatenotify-devel libmatewnck-devel mate-common mate-doc-utils icon-naming-utils
-Requires(pre):	mate-conf
-Requires(preun):	mate-conf
-Requires(post):	mate-conf
-Requires:	desktop-file-utils
+Name:           mate-notification-daemon
+Version:        1.5.0
+Release:        1%{?dist}
+Summary:        Notification daemon for MATE Desktop
+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(dbus-glib-1)
+BuildRequires:  pkgconfig(mate-desktop-2.0)
+BuildRequires:  pkgconfig(MateCORBA-2.0)
+BuildRequires:  pkgconfig(libcanberra)
+BuildRequires:  pkgconfig(libmatenotify)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+BuildRequires:  pkgconfig(libmatewnck)
+BuildRequires:  mate-common
+BuildRequires:  pkgconfig(mate-doc-utils)
+BuildRequires:  icon-naming-utils
+
+Requires:   gsettings-desktop-schemas
 
 %description
 Notification daemon for MATE Desktop
@@ -20,57 +28,62 @@ Notification daemon for MATE Desktop
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure --disable-static --disable-schemas-install 
+%configure --disable-static
+ 
 make %{?_smp_mflags} V=1
 
-%pre
-/sbin/ldconfig
-%mateconf_schema_prepare mate-notification-daemon
+%install
+make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
+
+find %{buildroot} -name '*.la' -exec rm -rf {} ';'
+find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
-%preun
-%mateconf_schema_remove mate-notification-daemon
+desktop-file-install                               \
+        --remove-category="MATE"                   \
+        --add-category="X-Mate"                    \
+        --delete-original                          \
+        --dir=%{buildroot}%{_datadir}/applications \
+%{buildroot}/%{_datadir}/applications/mate-notification-properties.desktop
+
+%find_lang %{name}
 
 %post
 /sbin/ldconfig
-%mateconf_schema_upgrade mate-notification-daemon
 /bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
 
 %postun
+/sbin/ldconfig
 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 || :
+    /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 || :
-
-%install
-export MATECONF_DISABLE_MAKE_FILE_SCHEMA INSTALL=1
-make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
-%find_lang %{name}
-find %{buildroot} -name '*.la' -exec rm -rf {} ';'
-find %{buildroot} -name '*.a' -exec rm -rf {} ';'
-
-desktop-file-install									\
-	--remove-category="MATE"							\
-	--add-category="X-Mate"								\
-	--delete-original								\
-	--dir=%{buildroot}%{_datadir}/applications					\
-%{buildroot}/%{_datadir}/applications/mate-notification-properties.desktop
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %{_bindir}/mate-notification-properties
-%{_sysconfdir}/mateconf/schemas/mate-notification-daemon.schemas
 %{_datadir}/applications/mate-notification-properties.desktop
 %{_datadir}/dbus-1/services/org.freedesktop.mate.Notifications.service
 %{_datadir}/mate-notification-daemon/mate-notification-properties.ui
 %{_libexecdir}/mate-notification-daemon
 %{_datadir}/icons/hicolor/*/apps/mate-notification-properties.*
+%{_datadir}/glib-2.0/schemas/org.mate.NotificationDaemon.gschema.xml
 %{_libdir}/mate-notification-daemon/
 
 
 %changelog
+* Tue Oct 30 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
+- update to 1.5.0 release
+- add schema scriptlets and remove mateconf scriptlets
+- add requires gsettings-desktop-schemas
+- add build requires gsettings-desktop-schemas-devel
+- change build requires style
+- fix ldconfig scriptlet
+
 * Wed Sep 26 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-9
 - Fix mate-conf scriptlets (again)
 
diff --git a/sources b/sources
index 5753020..5466a29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83956e38caeec78634af379abc1b5787  mate-notification-daemon-1.4.0.tar.xz
+393a7832e71aa8cfd28793750f88de50  mate-notification-daemon-1.5.0.tar.xz