summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-02-11 10:25:03 +0000
committerRoland McGrath <roland@gnu.org>2005-02-11 10:25:03 +0000
commit28c85b32ab50681c39105954b3fd5afa6c0b599a (patch)
tree8e3324bf134ed9d85bd9b0ef06de13e7dbbb33d1
parent7ecaea1e8edca7506c8403b845484dac5b8f9129 (diff)
Tweak grepping for devel.filelist/headers.filelist.
Make sure gnu/stubs-{32,64}.h goes into devel instead of headers.
-rw-r--r--fedora/glibc.spec.in15
1 files changed, 7 insertions, 8 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 89bf5d28f4..b3e739ce1e 100644
--- 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)