[packages/mate-window-manager] do not depend on mate-conf

glen glen at pld-linux.org
Tue Jan 15 22:15:59 CET 2013


commit 5e1a3c427dd054c00234d5cfc758a53cd0611bdd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jan 15 23:10:29 2013 +0200

    do not depend on mate-conf

 mate-window-manager.spec | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index ddcff51..8b3e722 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -4,7 +4,7 @@
 Summary:	MATE Desktop window manager
 Name:		mate-window-manager
 Version:	1.5.3
-Release:	0.5
+Release:	0.10
 License:	LGPL v2+ and GPL v2+
 Group:		X11/Window Managers
 Source0:	http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
@@ -93,7 +93,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -vf {} ';'
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmarco-private.la
+
+# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/marco.convert
 
 desktop-file-install \
 	--remove-category="MATE" \
@@ -125,10 +128,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/mate/help/creating-marco-themes/C/creating-marco-themes.xml
 %{_datadir}/mate/wm-properties
 %{_datadir}/glib-2.0/schemas/org.mate.marco.gschema.xml
-%{_datadir}/MateConf/gsettings/marco.convert
 %{_mandir}/man1/marco.1.*
 %{_mandir}/man1/marco-message.1.*
 
+# XXX find proper packages
+%dir %{_datadir}/mate-control-center
+%dir %{_datadir}/mate-control-center/keybindings
+%dir %{_datadir}/mate/help/creating-marco-themes
+%dir %{_datadir}/mate/help/creating-marco-themes/C
+
 %files themes
 %defattr(644,root,root,755)
 %{_datadir}/themes/ClearlooksRe
@@ -142,12 +150,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/themes/WinMe
 %{_datadir}/themes/eOS
 
-# XXX find proper packages
-%dir %{_datadir}/mate-control-center
-%dir %{_datadir}/mate-control-center/keybindings
-%dir %{_datadir}/mate/help/creating-marco-themes
-%dir %{_datadir}/mate/help/creating-marco-themes/C
-
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmarco-private.so.*.*.*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mate-window-manager.git/commitdiff/063e08a9c77de5a5990c3ffd977ececf911fc482



More information about the pld-cvs-commit mailing list