--- glibc.spec.orig 2005-02-09 01:32:46 +0300 +++ glibc.spec.orig 2005-04-14 18:25:26 +0400 @@ -47,7 +47,7 @@ Name: glibc Version: %basever.%snapshot -Release: alt2 +Release: alt3 Serial: 6 Summary: The GNU libc libraries @@ -190,8 +190,13 @@ PreReq: %name-core = %serial:%version-%release Conflicts: %name < %serial:%version-%release # hack +%ifarch x86_64 +Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "lib$n.so()(64bit) "; done) +Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "%_libdir/gconv/lib$n.so()(64bit) "; done) +%else Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "lib$n.so "; done) Provides: %(for n in CNS GB ISOIR165 JIS JISX0213 KSC; do echo -n "%_libdir/gconv/lib$n.so "; done) +%endif %package -n iconv Summary: The GNU libc charset conversion modules @@ -652,13 +657,13 @@ fgrep -v /%_lib/libnss1 | fgrep -v libNoVersion | egrep -v '/%_lib/libnss_([^f]|files\.so\.1)' | - %__sed -e "s|$RPM_BUILD_ROOT/debug/lib|%_libdir/debug|g" >core-debug.files + %__sed -e "s|$RPM_BUILD_ROOT/debug/%_lib|%_libdir/debug|g" >core-debug.files /bin/ls -1 $RPM_BUILD_ROOT/debug/%_lib/*.so* | fgrep nss | fgrep -v /%_lib/libnss_files-%basever.so | fgrep -v /%_lib/libnss_files.so.2 | - %__sed -e "s|$RPM_BUILD_ROOT/debug/lib|%_libdir/debug|g" >nss-debug.files + %__sed -e "s|$RPM_BUILD_ROOT/debug/%_lib|%_libdir/debug|g" >nss-debug.files /bin/ls -1 $RPM_BUILD_ROOT/debug%_libdir/lib*.so | %__sed -e "s|$RPM_BUILD_ROOT/debug%_libdir|%_libdir/debug|g" >>devel-debug.files @@ -983,6 +988,10 @@ %endif #enabled archopt %changelog +* Thu Apr 14 2005 Anton D. Kachalov 6:2.3.3.200406160000-alt3 +- fix debug list +- fix hack for gconv-modules + * Tue Feb 08 2005 Dmitry V. Levin 6:2.3.3.200406160000-alt2 - Backported upstream fixes: + i386/fpu/libm-test-ulps: Update for GCC 3.4.