- changed Conflicts to Obsoletes (Provides not added since there should be no BR...

Changed files:
    glibc.spec -> 1.462

diff --git a/glibc.spec b/glibc.spec
index 8c5a627ec275f51f89fb6269629749af1f053edb..1bb74e4de4f93a989556564fd02adbfc12b1a9fd 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -282,7 +282,7 @@ Summary(uk):        
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 %{!?with_kernelheaders:Requires:       linux-libc-headers >= %{llh_version}}
-Conflicts:     libiconv-devel
+Obsoletes:     libiconv-devel
 
 %description devel
 To develop programs which use the standard C libraries (which nearly
@@ -473,7 +473,7 @@ Summary(ru):        
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ glibc
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
-Conflicts:     libiconv-static
+Obsoletes:     libiconv-static
 
 %description static
 GNU libc static libraries.