summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-01-06 22:18:46 +0000
committerJakub Jelinek <jakub@redhat.com>2005-01-06 22:18:46 +0000
commite7cbcee4982d8caa809a91c9cfef5fda67445f0a (patch)
treef3bd1fe9ebe4f9bc6e776d531cd1d8852a7b5bae /fedora
parentf19db0eaff4a01856f67d58e2a07dbf63f8d132f (diff)
Updated to fedora-glibc-20050106T2203cvs/fedora-glibc-2_3_4-5
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in14
2 files changed, 12 insertions, 6 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index da12880aec..4c1e1f0f5c 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
# This file is updated automatically by Makefile.
glibc-branch := fedora
glibc-base := HEAD
-fedora-sync-date := 2005-01-06 14:43 UTC
-fedora-sync-tag := fedora-glibc-20050106T1443
+fedora-sync-date := 2005-01-06 22:03 UTC
+fedora-sync-tag := fedora-glibc-20050106T2203
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 4c7dc698c3..d063010b1f 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 nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1057,11 +1057,11 @@ for f in `find $RPM_BUILD_ROOT/%{_lib} -type l`; do
done
echo Sorting source file lists. Might take a while...
-xargs -0 -n 1 echo < $sf | LANG=C sort -u > $sf.sorted
-xargs -0 -n 1 echo < $csf | LANG=C sort -u > $csf.sorted
+xargs -0 -n 1 echo < $sf | LC_ALL=C grep -v '/<internal>$' | LC_ALL=C sort -u > $sf.sorted
+xargs -0 -n 1 echo < $csf | LC_ALL=C grep -v '/<internal>$' | LC_ALL=C sort -u > $csf.sorted
mkdir -p $RPM_BUILD_ROOT/usr/src/debug
cat $sf.sorted $csf.sorted \
- | (cd $RPM_BUILD_DIR; LANG=C sort -u | cpio -pdm ${RPM_BUILD_ROOT}/usr/src/debug)
+ | (cd $RPM_BUILD_DIR; LC_ALL=C sort -u | cpio -pdm ${RPM_BUILD_ROOT}/usr/src/debug)
# stupid cpio creates new directories in mode 0700, fixup
find $RPM_BUILD_ROOT/usr/src/debug -type d -print | xargs chmod a+rx
@@ -1270,6 +1270,12 @@ rm -f *.filelist*
%endif
%changelog
+* Thu Jan 6 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-5
+- update from CVS
+ - add some warn_unused_result marking
+ - make ftruncate available even for just -D_POSIX_C_SOURCE=200112L
+ (BZ#640)
+
* Thu Jan 6 2005 Jakub Jelinek <jakub@redhat.com> 2.3.4-4
- update from CVS
- fix IA-32 stack alignment for LinuxThreads thread functions