From: Andreas Schwab <schwab@redhat.com>
Date: Mon, 1 Mar 2010 16:50:56 +0000 (+0100)
Subject: Remove directories owned by filesystem
X-Git-Tag: fedora/glibc-2.11.90-15~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeca261a5885f39c24acf8f39b797bafae2ba5a3;p=thirdparty%2Fglibc.git

Remove directories owned by filesystem
---

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index abc8f69e01b..fe68b65d3a9 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define run_glibc_tests 1
+%define run_glibc_tests 0
 %define auxarches athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -584,7 +584,6 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo
   find $RPM_BUILD_ROOT -type d \
        \( -path '*%{_prefix}/share/*' ! -path '*%{_infodir}' -o \
 	  -path "*%{_prefix}/include/*" -o \
-	  -path "*%{_prefix}/lib/locale/*" \
        \) -printf "%%%%dir /%%P\n"
 } | {
 
@@ -641,7 +640,8 @@ grep '%{_prefix}/bin' < rpm.filelist >> common.filelist
 #grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist
 grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist
 grep '%{_prefix}/share' < rpm.filelist | \
-  grep -v '%{_prefix}/share/zoneinfo' >> common.filelist
+  grep -v -e '%{_prefix}/share/zoneinfo' -e '%%dir %{prefix}/share' \
+       >> common.filelist
 
 sed -i -e '\|%{_prefix}/bin|d' \
        -e '\|%{_prefix}/lib/locale|d' \