[mate-window-manager] fix dependencies

Dan Mashal vicodan at fedoraproject.org
Mon Sep 3 13:36:39 UTC 2012


commit 832d3229f69641c29f853c11e2245838a473614a
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date:   Mon Sep 3 06:36:28 2012 -0700

    fix dependencies

 mate-window-manager.spec |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index d7d5801..44b4fb2 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,6 +1,6 @@
 Name:		mate-window-manager
 Version:	1.4.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	MATE Desktop window manager
 License:	LGPLv2+ GPLv2+
 URL:		http://mate-desktop.org
@@ -13,7 +13,9 @@ Requires(pre):	mate-conf
 Requires(post):	mate-conf
 Requires(preun):	mate-conf
 
-Obsoletes: mate-window-manager < 1.4.1
+Obsoletes: mate-window-manager < 1.4.1-1
+Obsoletes: mate-window-manager-devel < 1.4.1-1
+Obsoletes: mate-window-manager-libs < 1.4.1-1
 
 %description
 MATE Desktop window manager
@@ -37,8 +39,8 @@ make %{?_smp_mflags} V=1
 
 
 %install
+export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=%{buildroot}
-
 %find_lang %{name} --all-name
 
 find %{buildroot} -name '*.a' -exec rm -vf {} ';'
@@ -91,8 +93,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
 %{_datadir}/themes/WinMe/metacity-1/*.xml
 %{_datadir}/themes/eOS/metacity-1/*.png
 %{_datadir}/themes/eOS/metacity-1/*.xml
-
-
 %{_datadir}/marco/icons/marco-window-demo.png
 %{_datadir}/mate-control-center/keybindings/50-marco-desktop-key.xml
 %{_datadir}/mate-control-center/keybindings/50-marco-key.xml
@@ -107,6 +107,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/marco.desktop
 
 
 %changelog
+* Mon Sep 03 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.1-2
+- Add environment variable to install section and further obsoletes to prevent dependency breakage
+
 * Sun Sep 02 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.1-1
 - Upgrade to new upstream version.
 


More information about the scm-commits mailing list