[packages/filesystem] C: X11-libs to assist ac->th upgrade

glen glen at pld-linux.org
Fri Sep 25 12:25:48 CEST 2015


commit 90e77461e194fecff4cc3853466566347e2ef8a5
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Sep 25 13:25:42 2015 +0300

    C: X11-libs to assist ac->th upgrade

 filesystem.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/filesystem.spec b/filesystem.spec
index 0fce2d8..6af9ba6 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -12,7 +12,7 @@ Summary:	Common directories
 Summary(pl.UTF-8):	Wspólne katalogi
 Name:		filesystem
 Version:	4.0
-Release:	44
+Release:	45
 License:	GPL
 Group:		Base
 BuildRequires:	automake
@@ -34,6 +34,9 @@ Provides:	browser-plugins(sparc)
 %endif
 Provides:	filesystem-debuginfo = %{version}-%{release}
 Obsoletes:	filesystem-debuginfo < 3.0-36
+%if "%{pld_release}" != "ac"
+Conflicts:	X11-libs < 1:7.7
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # Adapter: This file does not like to be adapterized!
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/filesystem.git/commitdiff/90e77461e194fecff4cc3853466566347e2ef8a5



More information about the pld-cvs-commit mailing list