Author: arekm Date: Tue Jun 7 11:31:07 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 5; prevent 32bit glibc-headers to be installed on 64bit system
---- Files affected:
packages/glibc:
glibc.spec (1.911 -> 1.912)
---- Diffs:
================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.911 packages/glibc/glibc.spec:1.912
--- packages/glibc/glibc.spec:1.911 Sun Jun 5 10:46:51 2011
+++ packages/glibc/glibc.spec Tue Jun 7 13:31:02 2011
@@ -36,7 +36,7 @@
Summary(uk.UTF-8): GNU libc версії
Name: glibc
Version: 2.14
-Release: 4
+Release: 5
Epoch: 6
License: LGPL v2.1+
Group: Libraries
@@ -363,7 +363,7 @@
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libcrypt(%{_target_cpu}) =
%{epoch}:%{version}-%{release}
-Requires: %{name}-devel-utils = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel-utils(%{_target_cpu}) =
%{epoch}:%{version}-%{release}
Requires: %{name}-headers = %{epoch}:%{version}-%{release}
Provides: %{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
Obsoletes: libiconv-devel
@@ -493,6 +493,16 @@
%ifarch sparc64
Obsoletes: glibc-devel-utils(sparc)
%endif
+# To protect x86_64 system from glibc-headers(32bit) installation
+%ifarch %{x8664}
+Conflicts: glibc-headers(athlon)
+Conflicts: glibc-headers(i386)
+Conflicts: glibc-headers(i486)
+Conflicts: glibc-headers(i586)
+Conflicts: glibc-headers(i686)
+Conflicts: glibc-headers(pentium3)
+Conflicts: glibc-headers(pentium4)
+%endif
%description devel-utils
The glibc-devel-utils package contains utilities necessary for
@@ -1735,6 +1745,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.912 2011/06/07 11:31:02 arekm
+- rel 5; prevent 32bit glibc-headers to be installed on 64bit system
+
Revision 1.911 2011/06/05 08:46:51 pluto
- better fix from glibc-fedora branch, release 4.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.911&r2=1.912&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
