From 362958ccc578cf8e82581742060ccfe33e77d3a0 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Aug 27 2012 12:00:08 +0000
Subject: License: LGPLv2+, %doc COPYING.LIB


- dir owndership
- don't use undefined %{po_package} macro
- s/MATE/X-MATE| only on < f18

---

diff --git a/libmatekbd.spec b/libmatekbd.spec
index 3e47525..83d1cef 100644
--- a/libmatekbd.spec
+++ b/libmatekbd.spec
@@ -1,8 +1,8 @@
 Name:		libmatekbd
 Version:	1.4.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Libraries for mate kbd
-License:	GPLv2+ and LGPLv2+
+License:	LGPLv2+
 URL:		http://mate-desktop.org
 Source0:	http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
 
@@ -33,11 +33,13 @@ make %{?_smp_mflags} V=1
 
 
 %install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name '*.a' -exec rm -f {} ';'
-%find_lang %{po_package} --all-name
+
+find %{buildroot} -name '*.la' -exec rm -fv {} ';'
+
+%find_lang %{name} --all-name
+
+%if 0%{?fedora} < 18
 desktop-file-install									\
 	--remove-category="MATE"							\
 	--add-category="X-Mate"								\
@@ -46,6 +48,12 @@ desktop-file-install									\
 	--delete-original								\
 	--dir=%{buildroot}%{_datadir}/applications					\
 %{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
+%endif
+
+
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
+
 
 %pre
 %mateconf_schema_prepare desktop_mate_peripherals_keyboard_xkb
@@ -58,20 +66,14 @@ desktop-file-install									\
 /sbin/ldconfig
 %mate_schema_remove desktop_mate_peripherals_keyboard_xkb
 
-
-%files -f %{po_package}.lang
-%{_datadir}/applications/matekbd-indicator-plugins-capplet.desktop
-%doc AUTHORS README
+%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/ui/matekbd-indicator-plugins.ui
-%{_datadir}/libmatekbd/ui/matekbd-indicator-plugins_add.ui
-%{_datadir}/libmatekbd/ui/show-layout.ui
-%{_libdir}/libmatekbd.so.4
-%{_libdir}/libmatekbd.so.4.2.0
-%{_libdir}/libmatekbdui.so.4
-%{_libdir}/libmatekbdui.so.4.2.0
+%{_datadir}/libmatekbd/
+%{_libdir}/libmatekbd.so.4*
+%{_libdir}/libmatekbdui.so.4*
 
 %files devel
 %{_includedir}/libmatekbd/
@@ -81,6 +83,12 @@ desktop-file-install									\
 %{_libdir}/libmatekbd.so
 
 %changelog
+* Mon Aug 27 2012 Rex Dieter <rdieter@fedoraproject.org> 1.4.0-4
+- License: LGPLv2+, %%doc COPYING.LIB
+- dir owndership
+- don't use undefined %%{po_package} macro
+- s/MATE/X-MATE| only on < f18
+
 * Sun Aug 26 2012 Dan Mashal <dan.mashal@fedoraproject.org> 1.4.0-3
 - Remove obsolete scriptlet from pre macro, correct schema scriptlets for mateconf and bump release version