summary refs log tree commit diff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2009-04-07 06:20:59 +0000
committerJakub Jelinek <jakub@redhat.com>2009-04-07 06:20:59 +0000
commit11799e4168a3ef36af3cb7ffb4f5cfaed7e244d7 (patch)
treedbf8c4b86a0b68b7754f43e579c8f035d47d1ec5 /fedora
parent1a6da537df1fe1726d95407ec04cf65caa1f8121 (diff)
downloadglibc-11799e4168a3ef36af3cb7ffb4f5cfaed7e244d7.tar.gz
glibc-11799e4168a3ef36af3cb7ffb4f5cfaed7e244d7.tar.xz
glibc-11799e4168a3ef36af3cb7ffb4f5cfaed7e244d7.zip
Updated to fedora-glibc-20090407T0545
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in11
2 files changed, 10 insertions, 5 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 7bf118a7a8..5d5323430d 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-f8
-fedora-sync-date := 2009-04-01 09:35 UTC
-fedora-sync-tag := fedora-glibc-20090401T0935
+fedora-sync-date := 2009-04-07 05:45 UTC
+fedora-sync-tag := fedora-glibc-20090407T0545
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 067ef2e8e4..92b7d62051 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -19,7 +19,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: @glibcversion@
-Release: 12
+Release: 13
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -48,7 +48,7 @@ Requires(pre): basesystem, libgcc
 # This is for building auxiliary programs like memusage, nscd
 # For initial glibc bootstraps it can be commented out
 BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3
-BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext
+BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext, nss-devel
 BuildRequires: /bin/ps, /bin/kill, /bin/awk
 # This is to ensure that __frame_state_for is exported by glibc
 # will be compatible with egcs 1.x.y
@@ -320,7 +320,7 @@ CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \
 	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
-	--disable-profile --enable-experimental-malloc
+	--disable-profile --enable-experimental-malloc --enable-nss-crypt
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -1009,6 +1009,11 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Apr  7 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-13
+- update from trunk
+- configure with --enable-nss-crypt
+- temporarily revert recent strverscmp cleanups (#494457)
+
 * Wed Apr  1 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-12
 - update from trunk
 - configure with --enable-experimental-malloc