[libmatekbd] update mateconf scriptlets and desktop-file-install

[Dan Mashal]

commit 2b30cddde4ca23ae60390b356a85fced3c3f629d
Author: dmashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 24 23:05:40 2012 -0700

    update mateconf scriptlets and desktop-file-install

 libmatekbd.spec |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/libmatekbd.spec b/libmatekbd.spec
index d97696f..db09d98 100644
--- a/libmatekbd.spec
+++ b/libmatekbd.spec
@@ -1,6 +1,6 @@
 Name:		libmatekbd
 Version:	1.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Libraries for mate kbd
 License:	LGPLv2+
 URL:		http://mate-desktop.org
@@ -42,10 +42,8 @@ find %{buildroot} -name '*.la' -exec rm -fv {} ';'
 desktop-file-install									\
 	--remove-category="MATE"							\
 	--add-category="X-Mate"								\
-%if 0%{?fedora} < 18
 	--remove-only-show-in="MATE"							\
-	--add-only-show-in="X-MATE"							\
-%endif
+	--add-only-show-in="X-Mate"							\
 	--delete-original								\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
@@ -56,16 +54,17 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/matekbd-indicator-plu
 
 
 %pre
+/sbin/ldconfig
+%mateconf_schema_obsolete desktop_mate_peripherals_keyboard_xkb
 %mateconf_schema_prepare desktop_mate_peripherals_keyboard_xkb
 
+%preun
+%mateconf_schema_remove desktop_mate_peripherals_keyboard_xkb
+
 %post
 /sbin/ldconfig
 %mateconf_schema_upgrade desktop_mate_peripherals_keyboard_xkb
 
-%postun
-/sbin/ldconfig
-%mate_schema_remove 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
@@ -83,6 +82,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/matekbd-indicator-plu
 %{_libdir}/libmatekbd.so
 
 %changelog
+* Mon Sep 26 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-5
+- Update desktop-file-install and fix mate-conf scriptlets
+
 * Mon Aug 27 2012 Rex Dieter <rdieter at fedoraproject.org> 1.4.0-4
 - License: LGPLv2+, %%doc COPYING.LIB
 - dir ownership