[mate-window-manager/f18] fix dependencies
Dan Mashal
vicodan at fedoraproject.org
Mon Sep 3 13:35:35 UTC 2012
commit 7a20a3254408524f5e34c5c256afffb647a28da8
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Mon Sep 3 06:35:20 2012 -0700
fix dependencies
mate-window-manager.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index d7d5801..1e33289 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -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