Tweak grepping for devel.filelist/headers.filelist.

Make sure gnu/stubs-{32,64}.h goes into devel instead of headers.

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 89bf5d28f48ea7293c4aa1c026b908118bfc8bea..b3e739ce1e456d8c9d8adf813575020bc6d689fb 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -840,9 +840,12 @@ for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do
 done
 
 grep '%{_prefix}/%{_lib}/lib.*_p\.a' < rpm.filelist > profile.filelist || :
-egrep "(%{_prefix}/include)|(%{_infodir})" < rpm.filelist |
-       grep -v %{_prefix}/include/nptl |
-       grep -v %{_infodir}/dir > devel.filelist
+grep '%{_infodir}' < rpm.filelist | grep -v '%{_infodir}/dir' > devel.filelist
+grep '%{_prefix}/include/gnu/stubs-[3264]\.h' < rpm.filelist >> devel.filelist
+
+grep '%{_prefix}/include' < rpm.filelist |
+       egrep -v '%{_prefix}/include/(nptl|gnu/stubs-[3264]+\.h)' \
+               > headers.filelist
 
 mv rpm.filelist rpm.filelist.full
 grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full |
@@ -853,10 +856,6 @@ grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist
 grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist
 grep '%{_mandir}' < rpm.filelist >> devel.filelist
 
-grep '%{_prefix}/include' < devel.filelist > headers.filelist
-grep -v '%{_prefix}/include' < devel.filelist > devel.filelist.tmp
-mv -f devel.filelist.tmp devel.filelist
-
 mv rpm.filelist rpm.filelist.full
 grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full |
        grep -v '%{_prefix}/%{_lib}/.*\.o' |
@@ -1637,7 +1636,7 @@ rm -f *.filelist*
 - update from CVS
   - fix BZ #151, #362, #381, #407
   - fdim fix for +inf/+inf (BZ #376)
- 
+
 * Sun Sep 26 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-58
 - update from CVS
   - vasprintf fix (BZ #346)