summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2009-07-30 15:34:10 +0200
committerAndreas Schwab <schwab@redhat.com>2009-07-30 15:34:10 +0200
commit50f823e4993cf6853caaa74fb1a6cd65b93688aa (patch)
treeb1ab3488fcdba2c254cf2a8997ceafd769a5842e
parentMerge commit 'origin/master' into fedora/master (diff)
downloadglibc-fedora/glibc-2.10.90-11.tar.gz
glibc-fedora/glibc-2.10.90-11.tar.bz2
glibc-fedora/glibc-2.10.90-11.zip
-rw-r--r--fedora/glibc.spec.in10
1 files changed, 7 insertions, 3 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 85fb0fdfd7..45c4e3f7f4 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -21,7 +21,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 10
+Release: 11
# 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
@@ -577,7 +577,7 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo
# BUILD THE FILE LIST
{
- find $RPM_BUILD_ROOT \( -type f -or -type l \) \
+ find $RPM_BUILD_ROOT \( -type f -o -type l \) \
\( \
-name etc -printf "%%%%config " -o \
-name gconv-modules \
@@ -585,7 +585,7 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo
-name gconv-modules.cache \
-printf "%%%%verify(not md5 size mtime) " \
, \
- ! -path "*/lib/debug" -printf "/%%P\n" \)
+ ! -path "*/lib/debug/*" -printf "/%%P\n" \)
find $RPM_BUILD_ROOT -type d \
\( -path '*%{_prefix}/share/*' ! -path '*%{_infodir}' -o \
-path "*%{_prefix}/include/*" -o \
@@ -1034,6 +1034,10 @@ rm -f *.filelist*
%endif
%changelog
+* Thu Jul 30 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-11
+- Update from master.
+- Don't package debuginfo files in glibc-devel.
+
* Tue Jul 28 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-10
- Update from master.
* fix memory ordering in pthread_mutex_unlock (BZ#10418)