- rel 5; prevent 32bit glibc-headers to be installed on 64bit system

Changed files:
    glibc.spec -> 1.912

diff --git a/glibc.spec b/glibc.spec
index c2e2a527fadf8e9387b16a59bd6f325d2a950c7d..d0ef34b73b6bf6b92c45f666e226f3492975a971 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -35,7 +35,7 @@ Summary(tr.UTF-8):    GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       2.14
-Release:       4
+Release:       5
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
@@ -362,7 +362,7 @@ Summary(uk.UTF-8):  Додаткові бібліотеки, потрібні д
 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
@@ -492,6 +492,16 @@ Obsoletes: glibc-devel-utils(s390)
 %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