[mate-control-center/f19] update spec file and pump version to latest upstream release

[Wolfgang Ulbrich]

commit 273cf359bdcf7f7e941a02587fc73f1ef65b65da
Author: raveit <chat-to-me at raveit.de>
Date:   Mon Mar 25 15:36:18 2013 +0100

    update spec file and pump version to latest upstream release

 mate-control-center.spec |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index b55024e..9e708c7 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,6 +1,6 @@
 Name:           mate-control-center
-Version:        1.5.4
-Release:        1%{?dist}
+Version:        1.5.5
+Release:        2%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
@@ -59,6 +59,7 @@ Development files for mate-control-center
 
 %build
 NOCONFIGURE=1 ./autogen.sh
+
 %configure \
            --disable-static          \
            --disable-schemas-compile \
@@ -74,24 +75,32 @@ make DESTDIR=%{buildroot} install
 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/*.desktop
-
 # delete mime cache
 rm %{buildroot}%{_datadir}/applications/mimeinfo.cache
 
 %find_lang %{name}
 
+%check
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/at-properties.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/default-applications.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/display-properties.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/keyboard.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-about-me.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-appearance-properties.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/matecc.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-font-viewer.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-keybinding.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-network-properties.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-settings-mouse.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/mate-theme-installer.desktop
+desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/window-properties.desktop
+
 
 %post
 /sbin/ldconfig
 /usr/bin/update-desktop-database &> /dev/null || :
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
@@ -99,15 +108,15 @@ rm %{buildroot}%{_datadir}/applications/mimeinfo.cache
 /usr/bin/update-desktop-database &> /dev/null || :
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 if [ $1 -eq 0 ] ; then
-    /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null
-    /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+    /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    /usr/bin/gtk-update-icon-cache %{_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 %{_datadir}/icons/hicolor &> /dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
@@ -157,6 +166,15 @@ fi
 %{_libdir}/pkgconfig/libslab.pc
 
 %changelog
+* Mon Mar 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.5.5-2
+- bump version in spec file
+
+* Sun Mar 24 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.5.5-1
+- update to new upstream release
+- remove desktop-file-install command
+- add desktop-file-validate command
+- fix icon cache rpm scriptlet
+
 * Mon Feb 18 2013 Dan Mashal <dan.mashal at fedoraproject.org> 1.5.4-1
 - Update to latest upstream release
 - Update directory ownership