SPECS: glibc.spec - no macros in obsoletes (we don't have any glibc64/glibc)

[glen]

Author: glen                         Date: Mon Mar  2 15:18:15 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- no macros in obsoletes (we don't have any glibc64/glibc)

---- Files affected:
SPECS:
   glibc.spec (1.804 -> 1.805) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.804 SPECS/glibc.spec:1.805
--- SPECS/glibc.spec:1.804	Fri Feb 27 11:35:35 2009
+++ SPECS/glibc.spec	Mon Mar  2 16:18:09 2009
@@ -85,7 +85,6 @@
 %else
 BuildRequires:	binutils >= 2:2.15.90.0.3
 %endif
-AutoReq:	false
 %{!?with_cross:BuildRequires:	dietlibc-static}
 BuildRequires:	gawk
 BuildRequires:	gcc >= 5:3.4
@@ -108,6 +107,7 @@
 Provides:	rtld(GNU_HASH)
 Obsoletes:	glibc-common
 Obsoletes:	glibc-debug
+AutoReq:	false
 %ifarch %{x8664} sparc64 ppc64
 Provides:	glibc64
 Obsoletes:	glibc64
@@ -271,10 +271,10 @@
 Summary:	Utilities and data used by glibc
 Summary(pl.UTF-8):	Narzędzia i dane używane przez glibc
 Group:		Applications/System
-AutoReq:	false
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Suggests:	localedb
 Suggests:	tzdata
+AutoReq:	false
 
 %description misc
 Utilities and data used by glibc.
@@ -401,22 +401,22 @@
 %ifarch %{x8664}
 # If both -m32 and -m64 is to be supported on x86_64, x86_64 package
 # have to be installed, not ix86 one.
-Obsoletes:	%{name}-headers(i386)
-Obsoletes:	%{name}-headers(i486)
-Obsoletes:	%{name}-headers(i586)
-Obsoletes:	%{name}-headers(i686)
-Obsoletes:	%{name}-headers(athlon)
-Obsoletes:	%{name}-headers(pentium3)
-Obsoletes:	%{name}-headers(pentium4)
+Obsoletes:	glibc-headers(athlon)
+Obsoletes:	glibc-headers(i386)
+Obsoletes:	glibc-headers(i486)
+Obsoletes:	glibc-headers(i586)
+Obsoletes:	glibc-headers(i686)
+Obsoletes:	glibc-headers(pentium3)
+Obsoletes:	glibc-headers(pentium4)
 %endif
 %ifarch ppc64
-Obsoletes:	%{name}-headers(ppc)
+Obsoletes:	glibc-headers(ppc)
 %endif
 %ifarch s390x
-Obsoletes:	%{name}-headers(s390)
+Obsoletes:	glibc-headers(s390)
 %endif
 %ifarch sparc64
-Obsoletes:	%{name}-headers(sparc)
+Obsoletes:	glibc-headers(sparc)
 %endif
 Requires:	linux-libc-headers >= %{llh_version}
 
@@ -449,22 +449,22 @@
 %ifarch %{x8664}
 # If both -m32 and -m64 is to be supported on AMD64, x86_64 package
 # have to be installed, not ix86 one.
-Obsoletes:	%{name}-devel-utils(i386)
-Obsoletes:	%{name}-devel-utils(i486)
-Obsoletes:	%{name}-devel-utils(i586)
-Obsoletes:	%{name}-devel-utils(i686)
-Obsoletes:	%{name}-devel-utils(athlon)
-Obsoletes:	%{name}-devel-utils(pentium3)
-Obsoletes:	%{name}-devel-utils(pentium4)
+Obsoletes:	glibc-devel-utils(athlon)
+Obsoletes:	glibc-devel-utils(i386)
+Obsoletes:	glibc-devel-utils(i486)
+Obsoletes:	glibc-devel-utils(i586)
+Obsoletes:	glibc-devel-utils(i686)
+Obsoletes:	glibc-devel-utils(pentium3)
+Obsoletes:	glibc-devel-utils(pentium4)
 %endif
 %ifarch ppc64
-Obsoletes:	%{name}-devel-utils(ppc)
+Obsoletes:	glibc-devel-utils(ppc)
 %endif
 %ifarch s390x
-Obsoletes:	%{name}-devel-utils(s390)
+Obsoletes:	glibc-devel-utils(s390)
 %endif
 %ifarch sparc64
-Obsoletes:	%{name}-devel-utils(sparc)
+Obsoletes:	glibc-devel-utils(sparc)
 %endif
 
 %description devel-utils
@@ -495,22 +495,22 @@
 %ifarch %{x8664}
 # If both -m32 and -m64 is to be supported on x86_64, x86_64 package
 # have to be installed, not ix86 one.
-Obsoletes:	%{name}-devel-doc(i386)
-Obsoletes:	%{name}-devel-doc(i486)
-Obsoletes:	%{name}-devel-doc(i586)
-Obsoletes:	%{name}-devel-doc(i686)
-Obsoletes:	%{name}-devel-doc(athlon)
-Obsoletes:	%{name}-devel-doc(pentium3)
-Obsoletes:	%{name}-devel-doc(pentium4)
+Obsoletes:	glibc-devel-doc(athlon)
+Obsoletes:	glibc-devel-doc(i386)
+Obsoletes:	glibc-devel-doc(i486)
+Obsoletes:	glibc-devel-doc(i586)
+Obsoletes:	glibc-devel-doc(i686)
+Obsoletes:	glibc-devel-doc(pentium3)
+Obsoletes:	glibc-devel-doc(pentium4)
 %endif
 %ifarch ppc64
-Obsoletes:	%{name}-devel-doc(ppc)
+Obsoletes:	glibc-devel-doc(ppc)
 %endif
 %ifarch s390x
-Obsoletes:	%{name}-devel-doc(s390)
+Obsoletes:	glibc-devel-doc(s390)
 %endif
 %ifarch sparc64
-Obsoletes:	%{name}-devel-doc(sparc)
+Obsoletes:	glibc-devel-doc(sparc)
 %endif
 
 %description devel-doc
@@ -1645,6 +1645,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.805  2009/03/02 15:18:09  glen
+- no macros in obsoletes (we don't have any glibc64/glibc)
+
 Revision 1.804  2009/02/27 10:35:35  arekm
 - tarballs finally uploaded
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glibc.spec?r1=1.804&r2=1.805&f=u