- add Conflicts on poldek < 0.18.8-4:

 Changelog from poldek.spec:
 - added cookie patch (bugfix, avoid small forward fseeks) to make poldek
   usable with glibc 2.3.5

Changed files:
    glibc.spec -> 1.595

diff --git a/glibc.spec b/glibc.spec
index 560f8b89668ecdf69fcb8fd1c144650507fdae0e..c0c20b71d2b9b2b1be501331b07a3d451230305e 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -75,7 +75,7 @@ Summary(tr):  GNU libc
 Summary(uk):   GNU libc ×ÅÒÓ¦§ 2.3
 Name:          glibc
 Version:       2.3.5
-Release:       0.1
+Release:       0.2
 Epoch:         6
 License:       LGPL
 Group:         Libraries
@@ -93,6 +93,7 @@ Source5:      %{name}-man-pages.tar.bz2
 Source6:       %{name}-non-english-man-pages.tar.bz2
 # Source6-md5: 6159f0a9b6426b5f6fc1b0d8d21b9b76
 Source7:       %{name}-localedb-gen
+Source8:       %{name}-LD-path.c
 Patch0:                %{name}-info.patch
 Patch1:                %{name}-pl.po-update.patch
 Patch2:                %{name}-pld.patch
@@ -161,6 +162,7 @@ Conflicts:  ld.so < 1.9.9-10
 Conflicts:     man-pages < 1.43
 Conflicts:     rc-scripts < 0.3.1-13
 Conflicts:     rpm < 4.1
+Conflicts:     poldek < 0.18.8-4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                debugcflags     -O1 -g
@@ -901,6 +903,8 @@ cd ..
 done
 %endif
 
+%{__cc} %{SOURCE8} %{rpmcflags} -static -o glibc-postinst
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{logrotate.d,rc.d/init.d,sysconfig},%{_mandir}/man{3,8},/var/log,/var/{lib,run}/nscd}
@@ -927,6 +931,7 @@ install elf/soinit.os                               $RPM_BUILD_ROOT%{_libdir}/soinit.o
 install elf/sofini.os                          $RPM_BUILD_ROOT%{_libdir}/sofini.o
 
 install elf/postshell                          $RPM_BUILD_ROOT/sbin
+install glibc-postinst                         $RPM_BUILD_ROOT/sbin
 cd ..
 
 %if %{with dual}
@@ -1099,7 +1104,8 @@ rm -rf $RPM_BUILD_ROOT
 %else
 %post  -p /sbin/postshell
 %endif
-/sbin/ldconfig
+/sbin/glibc-postinst /%{_lib}/%{_host_cpu}
+/sbin/ldconfig /%{_lib} %{_prefix}/%{_lib}
 -/sbin/telinit u
 
 %ifarch amd64 ppc64 s390x sparc64
@@ -1182,6 +1188,7 @@ fi
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
 %attr(755,root,root) /sbin/postshell
+%attr(755,root,root) /sbin/glibc-postinst
 %attr(755,root,root) /sbin/ldconfig
 # ld* and libc.so.6 SONAME symlinks must be in package because of
 # chicken-egg problem (postshell is dynamically linked with libc);