summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2006-05-24 07:30:09 +0000
committerJakub Jelinek <jakub@redhat.com>2006-05-24 07:30:09 +0000
commite482d83fb7eedcb449bfe80a6aa240cbd114c571 (patch)
treeaab89016726b4c378efee7fec33367b648ba3643 /fedora
parent5a04a4228c17def8ccffb60c932fcfea7fdee7cd (diff)
Updated to fedora-glibc-20060524T0721cvs/fedora-glibc-2_4_90-10
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in8
2 files changed, 9 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 089526bce8..773fe3e523 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-21 21:53 UTC
-fedora-sync-tag := fedora-glibc-20060521T2153
+fedora-sync-date := 2006-05-24 07:21 UTC
+fedora-sync-tag := fedora-glibc-20060524T0721
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 076dae064a..0360f5dd66 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 9
+%define glibcrelease 10
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define prelinkarches noarch
%define xenarches i686 athlon
@@ -839,6 +839,7 @@ cd build-%{nptl_target_cpu}-linuxnptl && \
%endif
%if %{buildxen}
+%define nosegneg_subdir_base i686
%define nosegneg_subdir i686/nosegneg
cd build-%{nptl_target_cpu}-linuxnptl-nosegneg
SubDir=%{nosegneg_subdir}
@@ -1308,6 +1309,7 @@ rm -f *.filelist*
%files -f rpm.filelist
%defattr(-,root,root)
%if %{buildxen} && !%{xenpackage}
+%dir /%{_lib}/%{nosegneg_subdir_base}
%dir /%{_lib}/%{nosegneg_subdir}
%endif
%ifarch s390x
@@ -1392,6 +1394,10 @@ rm -f *.filelist*
%endif
%changelog
+* Wed May 24 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-10
+- on i686 make glibc owner of /lib/i686 directory (#192597)
+- search parent NIS+ domains (#190803)
+
* Sun May 21 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-9
- update from CVS
- big NIS+ changes