[mate-control-center] update spec file, rebuild against new mate-window-manager

[Dan Mashal]

commit e17777aa4fa35f916ec2cb98c23199313a891251
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Mar 25 15:22:12 2013 -0700

    update spec file, rebuild against new mate-window-manager

 mate-control-center.spec |   67 +++++++++++++++-------------------------------
 1 files changed, 22 insertions(+), 45 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index 9e708c7..a3810ee 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,6 +1,6 @@
 Name:           mate-control-center
 Version:        1.5.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MATE Desktop control-center
 License:        LGPLv2+ and GPLv2+
 URL:            http://mate-desktop.org
@@ -31,6 +31,7 @@ BuildRequires: nss-devel
 BuildRequires: polkit-devel
 BuildRequires: unique-devel
 
+
 Obsoletes: libslab < 1.5.3
 
 # sample code block for handling distributions which cant provide
@@ -59,9 +60,7 @@ Development files for mate-control-center
 
 %build
 NOCONFIGURE=1 ./autogen.sh
-
-%configure \
-           --disable-static          \
+%configure --disable-static          \
            --disable-schemas-compile \
            --disable-update-mimedb   \
            --disable-scrollkeeper
@@ -75,32 +74,22 @@ make DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.la' -exec rm -rf {} ';'
 find %{buildroot} -name '*.a' -exec rm -rf {} ';'
 
+desktop-file-install									\
+	--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
@@ -108,37 +97,24 @@ desktop-file-validate ${RPM_BUILD_ROOT}/%{_datadir}/applications/window-properti
 /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 || :
 
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING README
 %config %{_sysconfdir}/xdg/menus/matecc.menu
-%{_bindir}/mate-about-me
-%{_bindir}/mate-appearance-properties
-%{_bindir}/mate-at-properties
-%{_bindir}/mate-control-center
-%{_bindir}/mate-default-applications-properties
-%{_bindir}/mate-display-properties
-%{_bindir}/mate-font-viewer
-%{_bindir}/mate-keybinding-properties
-%{_bindir}/mate-keyboard-properties
-%{_bindir}/mate-mouse-properties
-%{_bindir}/mate-network-properties
-%{_bindir}/mate-thumbnail-font
-%{_bindir}/mate-typing-monitor
-%{_bindir}/mate-window-properties
+%{_bindir}/mate-*
 %{_libdir}/libmate-window-settings.so.*
-%{_libdir}/window-manager-settings/
+%{_libdir}/window-manager-settings
 %{_sbindir}/mate-display-properties-install-systemwide
 %{_datadir}/applications/*.desktop
 %{_datadir}/desktop-directories/matecc.directory
@@ -156,16 +132,21 @@ fi
 %{_datadir}/MateConf/gsettings/mate-control-center.convert
 
 %files devel
-%{_includedir}/mate-window-settings-2.0
+%{_includedir}/mate-window-settings-2.0/
 %{_libdir}/pkgconfig/mate-window-settings-2.0.pc
 %{_libdir}/libmate-window-settings.so
 %{_datadir}/pkgconfig/mate-default-applications.pc
 %{_datadir}/pkgconfig/mate-keybindings.pc
-%{_includedir}/libslab/
+%{_includedir}/libslab
 %{_libdir}/libslab.so
 %{_libdir}/pkgconfig/libslab.pc
 
 %changelog
+* Mon Mar 25 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.5-3
+- Readd desktop file install and remove desktop file validate
+- Own proper dirs
+- Use buildroot macro instead of rpm_build_root
+
 * Mon Mar 25 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.5.5-2
 - bump version in spec file
 
@@ -175,11 +156,6 @@ fi
 - 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
-- Update bindir file listing
-
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -250,3 +226,4 @@ fi
 
 * Sat Sep 01 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-1
 - Initial build
+