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.in10
2 files changed, 11 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index ae06ce3ee7..040e9efd2d 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-10-29 21:55 UTC
-fedora-sync-tag := fedora-glibc-20061029T2155
+fedora-sync-date := 2006-11-03 16:10 UTC
+fedora-sync-tag := fedora-glibc-20061103T1610
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index e3fe59977e..4b1b31cb9e 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 3
+%define glibcrelease 4
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -904,6 +904,7 @@ librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*`
%ifarch %{rtkaioarches}
rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.so*
+rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/librt.so.*
mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio
mv $RPM_BUILD_ROOT/%{_lib}/librtkaio-*.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/
rm -f $RPM_BUILD_ROOT/%{_lib}/$librtso
@@ -1528,6 +1529,13 @@ rm -f *.filelist*
%endif
%changelog
+* Fri Nov 3 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-4
+- fix atexit backwards compatibility (#213388)
+- add mai_IN locale (#213415)
+- remove bogus %{_libdir}/librt.so.1 symlink (#213555)
+- fix memusage (#213656)
+- change libc.info category (#209493)
+
* Sun Oct 29 2006 Jakub Jelinek <jakub@redhat.com> 2.5.90-3
- fix suid/sgid binaries on i?86/x86_64 (#212723)