[libmatekbd] update to 1.5.0 release

[leigh123linux]

commit efd19d6aa3c83854607ec1400cfc362b613088a7
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Mon Oct 29 15:17:33 2012 +0000

    update to 1.5.0 release

 .gitignore      |    1 +
 libmatekbd.spec |   69 +++++++++++++++++++++++++++++++------------------------
 sources         |    2 +-
 3 files changed, 41 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70e381a..f43409c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /libmatekbd-1.4.0.tar.xz
+/libmatekbd-1.5.0.tar.xz
diff --git a/libmatekbd.spec b/libmatekbd.spec
index a0ae132..fa65e48 100644
--- a/libmatekbd.spec
+++ b/libmatekbd.spec
@@ -1,23 +1,26 @@
-Name:		libmatekbd
-Version:	1.4.0
-Release:	6%{?dist}
-Summary:	Libraries for mate kbd
-License:	LGPLv2+
-URL:		http://mate-desktop.org
-Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
+Name:           libmatekbd
+Version:        1.5.0
+Release:        1%{?dist}
+Summary:        Libraries for mate kbd
+License:        LGPLv2+
+URL:            http://mate-desktop.org
+Source0:        http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
 
-BuildRequires:	desktop-file-utils gtk2-devel libxklavier-devel mate-common mate-conf-devel
-Requires(pre):	mate-conf
-Requires(post):	mate-conf
-Requires(preun):	mate-conf
+BuildRequires:  desktop-file-utils
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(libxklavier)
+BuildRequires:  mate-common
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
+
+Requires:       gsettings-desktop-schemas
 
 
 %description
 Libraries for matekbd
 
 %package devel
-Summary: Development libraries for libmatekbd
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+Summary:  Development libraries for libmatekbd
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 Development libraries for libmatekbd
@@ -28,7 +31,7 @@ NOCONFIGURE=1 ./autogen.sh
 
 
 %build
-%configure --disable-static --disable-schemas-install
+%configure --disable-static
 make %{?_smp_mflags} V=1
 
 
@@ -37,37 +40,36 @@ make install DESTDIR=%{buildroot}
 
 find %{buildroot} -name '*.la' -exec rm -fv {} ';'
 
-%find_lang %{name} --all-name
 
-desktop-file-install									\
-	--remove-category="MATE"							\
-	--add-category="X-Mate"								\
-	--delete-original								\
-	--dir=%{buildroot}%{_datadir}/applications					\
-%{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
+#desktop-file-install									\
+#	--remove-category="MATE"							\
+#	--add-category="X-Mate"								\
+#	--delete-original								\
+#	--dir=%{buildroot}%{_datadir}/applications					\
+#%{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
 
 
-%check
-desktop-file-validate %{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
+%find_lang %{name} --all-name
 
 
 %pre
 /sbin/ldconfig
-%mateconf_schema_prepare desktop_mate_peripherals_keyboard_xkb
 
-%preun
-%mateconf_schema_remove desktop_mate_peripherals_keyboard_xkb
+%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 || :
 
 %post
 /sbin/ldconfig
-%mateconf_schema_upgrade desktop_mate_peripherals_keyboard_xkb
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING.LIB README
-%config(noreplace) %{_sysconfdir}/mateconf/schemas/desktop_mate_peripherals_keyboard_xkb.schemas
-%{_bindir}/matekbd-indicator-plugins-capplet
-%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
 %{_datadir}/libmatekbd/
+%{_datadir}/glib-2.0/schemas/org.mate.peripherals-keyboard-xkb.gschema.xml
 %{_libdir}/libmatekbd.so.4*
 %{_libdir}/libmatekbdui.so.4*
 
@@ -79,6 +81,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/matekbd-indicator-plu
 %{_libdir}/libmatekbd.so
 
 %changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
+- update to 1.5.0 release
+- change build requires style
+- remove mateconf scriplets and replace with schema scriptlets
+- add requires gsettings-desktop-schemas
+- add build requires gsettings-desktop-schemas-devel
+
 * Wed Sep 26 2012 Dan Mashal <dan.mashal at fedoraproject.org>  1.4.0-6
 - Remove onlyshowin from desktop-fileinstall  and mateconf_obsolete macro
 - Fix date on previous changelog (I was tired, sorry).
diff --git a/sources b/sources
index 3473918..949c538 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0c8ffecd33423de6baf9069de1aa75a6  libmatekbd-1.4.0.tar.xz
+aa3781beb79ceb8126df589cea481140  libmatekbd-1.5.0.tar.xz