diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
| commit | 8833066b122427710a9e14a888ce6cfa862332d3 (patch) | |
| tree | 29591019d695919417b3698618d6a342e97381d6 /fedora | |
| parent | fedca46896bdb702cb988837a0c2c5447e72ba2b (diff) | |
Updated to fedora-glibc-20070731T1624cvs/fedora-glibc-2_6_90-1
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/Makefile | 2 | ||||
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 15 | ||||
| -rw-r--r-- | fedora/makepatch.awk | 1 |
4 files changed, 16 insertions, 6 deletions
diff --git a/fedora/Makefile b/fedora/Makefile index 73a6fd2287..e2d037341b 100644 --- a/fedora/Makefile +++ b/fedora/Makefile @@ -114,7 +114,7 @@ $(tar-name)-$(branch-name).patch: makepatch.awk glibc.spec \ mv -f patch.tmp $@ # makepatch.awk omits these files from the patch; we put them in a tar file. -outside-patch = fedora c_stubs rtkaio powerpc-cpu \ +outside-patch = fedora c_stubs rtkaio \ localedata/charmaps/GB18030 iconvdata/gb18030.c $(tar-name)-$(branch-name)-$(snapshot-name).tar.bz2: Makefile branch.mk \ diff --git a/fedora/branch.mk b/fedora/branch.mk index f04611d44b..6725eedabf 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc7 -fedora-sync-date := 2007-05-15 20:25 UTC -fedora-sync-tag := fedora-glibc-20070515T2025 +fedora-sync-date := 2007-07-31 16:24 UTC +fedora-sync-tag := fedora-glibc-20070731T1624 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 9aaf4e76e1..d228db7dbd 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 4 +%define glibcrelease 1 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -869,7 +869,7 @@ if [ "$platform" != power6 ]; then %endif export LD_PRELOAD=`pwd`/power6emul/\$LIB/power6emul.so fi -AddOns=",powerpc-cpu$AddOns --with-cpu=power6" +AddOns="$AddOns --with-cpu=power6" GCC="$GCC -mcpu=power6" GXX="$GXX -mcpu=power6" build_nptl linuxnptl-power6 @@ -1397,6 +1397,9 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid} touch $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive %endif +mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig +> $RPM_BUILD_ROOT/var/cache/ldconfig/aux-cache + %post -p /usr/sbin/glibc_post_upgrade.%{_target_cpu} %postun -p /sbin/ldconfig @@ -1490,6 +1493,8 @@ rm -f *.filelist* %dir /etc/ld.so.conf.d %dir %{_prefix}/libexec/getconf %dir %{_prefix}/%{_lib}/gconv +%dir %attr(0700,root,root) /var/cache/ldconfig +%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/cache/ldconfig/aux-cache %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/ld.so.cache %doc README NEWS INSTALL FAQ BUGS NOTES PROJECTS CONFORMANCE %doc COPYING COPYING.LIB README.libm LICENSES @@ -1561,6 +1566,12 @@ rm -f *.filelist* %endif %changelog +* Tue Jul 31 2007 Jakub Jelinek <jakub@redhat.com> 2.6.90-1 +- update to trunk + - private futex optimizations + - open{,at}{,64} argument checking +- ldconfig speedups + * Sun Jul 8 2007 Jakub Jelinek <jakub@redhat.com> 2.6-4 - filter <built-in> pseudo-files from debuginfo source lists (#245714) - fix sscanf when errno is EINTR before the call (BZ#4745) diff --git a/fedora/makepatch.awk b/fedora/makepatch.awk index fadf1c7e56..fba827de4b 100644 --- a/fedora/makepatch.awk +++ b/fedora/makepatch.awk @@ -32,7 +32,6 @@ if ($2 ~ /.cvsignore$/ || $2 ~ /^c_stubs/ || $2 ~ /^rtkaio/ || - $2 ~ /^powerpc-cpu/ || $2 ~ /^fedora/ || $2 ~ /^localedata\/charmaps\/GB18030/ || $2 ~ /^iconvdata\/gb18030\.c/) { |