packages: glibc/glibc.spec - rel 6; better way: glibc-devel.x86_64 Requires...

[arekm]

Author: arekm                        Date: Tue Jun  7 11:54:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 6; better way: glibc-devel.x86_64 Requires glibc-headers(64bit) while glibc-devel.i686 Requires glibc-headers (without X bit indication)

---- Files affected:
packages/glibc:
   glibc.spec (1.912 -> 1.913) 

---- Diffs:

================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.912 packages/glibc/glibc.spec:1.913
--- packages/glibc/glibc.spec:1.912	Tue Jun  7 13:31:02 2011
+++ packages/glibc/glibc.spec	Tue Jun  7 13:53:57 2011
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	2.14
-Release:	5
+Release:	6
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -363,8 +363,12 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libcrypt(%{_target_cpu}) = %{epoch}:%{version}-%{release}
-Requires:	%{name}-devel-utils(%{_target_cpu}) = %{epoch}:%{version}-%{release}
+Requires:	%{name}-devel-utils = %{epoch}:%{version}-%{release}
+%if "%{_lib}" = "lib64"
+Requires:	%{name}-headers(64bit) = %{epoch}:%{version}-%{release}
+%else
 Requires:	%{name}-headers = %{epoch}:%{version}-%{release}
+%endif
 Provides:	%{name}-devel(%{_target_cpu}) = %{epoch}:%{version}-%{release}
 Obsoletes:	libiconv-devel
 
@@ -425,6 +429,9 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe do tworzenia programów przy użyciu standardowych bibliotek C
 Group:		Development/Building
 Provides:	%{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release}
+%if "%{_lib}" = "lib64"
+Provides:	%{name}-headers(64bit) = %{epoch}:%{version}-%{release}
+%endif
 %ifarch %{x8664}
 # If both -m32 and -m64 is to be supported on x86_64, x86_64 package
 # have to be installed, not ix86 one.
@@ -493,16 +500,6 @@
 %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
@@ -1745,6 +1742,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.913  2011/06/07 11:53:57  arekm
+- rel 6; better way: glibc-devel.x86_64 Requires glibc-headers(64bit) while glibc-devel.i686 Requires glibc-headers (without X bit indication)
+
 Revision 1.912  2011/06/07 11:31:02  arekm
 - rel 5; prevent 32bit glibc-headers to be installed on 64bit system
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc.spec?r1=1.912&r2=1.913&f=u