summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in4
2 files changed, 5 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 502adadffb..5c2c1cdbd4 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-08-02 18:08 UTC
-fedora-sync-tag := fedora-glibc-20060802T1808
+fedora-sync-date := 2006-08-07 18:59 UTC
+fedora-sync-tag := fedora-glibc-20060807T1859
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 67a6b71b7e..ba46724e32 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 17
+%define glibcrelease 18
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -1438,6 +1438,8 @@ rm -f *.filelist*
%endif
%changelog
+* Mon Aug 7 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-18
+- NIS+ fixes
- fix memusage and xtrace scripts (#200736)
- redirect /sbin/service sshd condrestart std{out,err} to /dev/null
when executed from glibc_post_upgrade