[packages/mate-control-center] up to 1.5.3

[glen]

commit 7c221eb13ebce4216862ec59eb03a9deab38c4dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Jan 16 00:59:24 2013 +0200

    up to 1.5.3
    
    - libslab package is removed. noting else outside m-c-c uses it

 mate-control-center.spec | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)
---
diff --git a/mate-control-center.spec b/mate-control-center.spec
index b4ce40a..976f197 100644
--- a/mate-control-center.spec
+++ b/mate-control-center.spec
@@ -1,11 +1,11 @@
 Summary:	MATE Desktop control-center
 Name:		mate-control-center
-Version:	1.5.2
+Version:	1.5.3
 Release:	0.2
 License:	LGPL v2+ and GPL v2+
 Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
-# Source0-md5:	265cff2fa1b3c1c4232bb1743d079c73
+# Source0-md5:	7647989b5014143547fc09c5f25821d2
 URL:		http://wiki.mate-desktop.org/mate-control-center
 BuildRequires:	dbus-glib-devel
 BuildRequires:	dconf-devel
@@ -49,15 +49,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 MATE Desktop Control Center
 
-%package -n libslab
-Summary:	MATE Desktop libslab port
-License:	LGPL v2+
-Group:		Libraries
-
-%description -n libslab
-This package provides libslab which is used in MATE control panel and
-in gnome-main-menu.
-
 %package devel
 Summary:	Development files for mate-settings-daemon
 Group:		X11/Development/Libraries
@@ -90,6 +81,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libslab.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/window-manager-settings/libmarco.la
 
+# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-control-center.convert
+
 desktop-file-install \
 	--remove-category="MATE" \
 	--add-category="X-Mate" \
@@ -119,17 +113,12 @@ rm -rf $RPM_BUILD_ROOT
 %update_mime_database
 %glib_compile_schemas
 
-%post	-n libslab -p /sbin/ldconfig
-%postun	-n libslab -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING README
 %{_sysconfdir}/xdg/menus/matecc.menu
 %attr(755,root,root) %{_bindir}/mate-*
 %attr(755,root,root) %{_sbindir}/mate-display-properties-install-systemwide
-%attr(755,root,root) %{_libdir}/libmate-window-settings.so.*.*.*
-%ghost %{_libdir}/libmate-window-settings.so.1
 %dir %{_libdir}/window-manager-settings
 %attr(755,root,root) %{_libdir}/window-manager-settings/libmarco.so
 %{_desktopdir}/*.desktop
@@ -143,23 +132,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/thumbnailers/mate-font-viewer.thumbnailer
 %{_datadir}/polkit-1/actions/org.mate.randr.policy
 
-# XXX proper package
-%dir %{_datadir}/mate/cursor-fonts
-
-%files -n libslab
-%defattr(644,root,root,755)
+# -libs
+%attr(755,root,root) %{_libdir}/libmate-window-settings.so.*.*.*
+%ghost %{_libdir}/libmate-window-settings.so.1
 %attr(755,root,root) %{_libdir}/libslab.so.*.*.*
 %ghost %{_libdir}/libslab.so.0
 
+# XXX proper package
+%dir %{_datadir}/mate/cursor-fonts
+
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libmate-window-settings.so
+%{_includedir}/libslab
 %{_includedir}/mate-window-settings-2.0
-%{_pkgconfigdir}/mate-window-settings-2.0.pc
+%{_libdir}/libmate-window-settings.so
+%{_libdir}/libslab.so
 %{_npkgconfigdir}/mate-default-applications.pc
 %{_npkgconfigdir}/mate-keybindings.pc
-
-# libslab
-%{_libdir}/libslab.so
-%{_includedir}/libslab
 %{_pkgconfigdir}/libslab.pc
+%{_pkgconfigdir}/mate-window-settings-2.0.pc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-control-center.git/commitdiff/2390cf683c7d62e7be1ff618fb557ca0c0ad202e