diff options
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index 3c1ff4fcb9..f6f2a0acd4 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -3,5 +3,5 @@ glibc-branch := fedora glibc-base := HEAD DIST_BRANCH := devel COLLECTION := dist-fc4 -fedora-sync-date := 2006-05-01 07:51 UTC -fedora-sync-tag := fedora-glibc-20060501T0751 +fedora-sync-date := 2006-05-05 05:54 UTC +fedora-sync-tag := fedora-glibc-20060505T0554 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 3e5f08939e..a648725749 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 4 +%define glibcrelease 5 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -954,6 +954,8 @@ rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1 # Ugly hack for buggy rpm ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}} +rm -f $RPM_BUILD_ROOT/etc/gai.conf + # BUILD THE FILE LIST find $RPM_BUILD_ROOT -type f -or -type l | sed -e 's|.*/etc|%config &|' \ @@ -1070,8 +1072,9 @@ rm -rf documentation mkdir documentation cp crypt/README.ufc-crypt documentation/README.ufc-crypt cp timezone/README documentation/README.timezone -cp ChangeLog{,.14,.15} documentation +cp ChangeLog{,.15,.16} documentation bzip2 -9 documentation/ChangeLog* +cp ../posix/gai.conf documentation/ %ifarch s390x # Compatibility symlink @@ -1389,6 +1392,12 @@ rm -f *.filelist* %endif %changelog +* Fri May 5 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-5 +- update from CVS + - some NIS+ fixes + - allow overriding rfc3484 address sorting tables for getaddrinfo + through /etc/gai.conf (sample config file included in %%doc directory) + * Mon May 1 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-4 - update from CVS - SETENT_BATCH_READ /etc/default/nss option for speeding up |