diff options
| author | Roland McGrath <roland@gnu.org> | 2004-09-22 22:29:44 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-09-22 22:29:44 +0000 |
| commit | 996d168e574d6867fae64b5af7cf2fd794bff674 (patch) | |
| tree | aea8cb355470a3721278585febd8e71eea7b2137 /fedora | |
| parent | 05bb11efb2a44b9131da48cb8fcb937a73554a75 (diff) | |
| download | glibc-996d168e574d6867fae64b5af7cf2fd794bff674.tar.gz glibc-996d168e574d6867fae64b5af7cf2fd794bff674.tar.xz glibc-996d168e574d6867fae64b5af7cf2fd794bff674.zip | |
Tweak expected source directory names.
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/glibc.spec.in | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 88746168bd..40d7514201 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -12,7 +12,8 @@ Version: %{glibcversion} Release: %{glibcrelease} Copyright: LGPL Group: System Environment/Libraries -Source0: %{name}-%{glibcdate}.tar.bz2 +%define glibcsrcdir %{name}-%{glibcdate} +Source0: %{glibcsrcdir}.tar.bz2 Source1: %{name}-fedora-%{glibcdate}.tar.bz2 Patch0: %{name}-fedora.patch Patch1: %{name}-nptl-check.patch @@ -75,7 +76,7 @@ BuildRequires: gcc >= 3.2.1-5 BuildPreReq: elfutils >= 0.72 BuildPreReq: rpm >= 4.2-0.56 %endif -%define __find_provides %{_builddir}/%{name}-%{version}-%{glibcdate}/find_provides.sh +%define __find_provides %{_builddir}/%{glibcsrcdir}/find_provides.sh %define _filter_GLIBC_PRIVATE 1 %description @@ -245,7 +246,7 @@ package or when debugging this package. %endif %prep -%setup -q -n %{name}-%{version}-%{glibcdate} -a1 +%setup -q -n %{glibcsrcdir} -a1 %patch0 -p1 case "`gcc --version | head -1`" in gcc*\ 3.3*) @@ -1068,18 +1069,18 @@ find $RPM_BUILD_ROOT/usr/src/debug -type d -print | xargs chmod a+rx %define basearch sparc %endif cat $blf > debuginfo.filelist -find $RPM_BUILD_ROOT/usr/src/debug/%{name}-%{version}-%{glibcdate} -type d \ +find $RPM_BUILD_ROOT/usr/src/debug/%{glibcsrcdir} -type d \ | sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfo.filelist -grep '/generic/\|/linux/\|/%{basearch}/\|/nptl\(_db\)\?/\|^%{name}-%{version}-%{glibcdate}/build' \ +grep '/generic/\|/linux/\|/%{basearch}/\|/nptl\(_db\)\?/\|^%{glibcsrcdir}/build' \ $sf.sorted | sed 's|^|/usr/src/debug/|' >> debuginfo.filelist touch debuginfocommon.filelist %else -( grep '^%{name}-%{version}-%{glibcdate}/build-\|dl-osinfo\.h' $csf.sorted || : ) > $csf.sorted.build +( grep '^%{glibcsrcdir}/build-\|dl-osinfo\.h' $csf.sorted || : ) > $csf.sorted.build cat $blf > debuginfo.filelist cat $cblf > debuginfocommon.filelist -grep '^%{name}-%{version}-%{glibcdate}/build-\|dl-osinfo\.h' $sf.sorted \ +grep '^%{glibcsrcdir}/build-\|dl-osinfo\.h' $sf.sorted \ | sed 's|^|/usr/src/debug/|' >> debuginfo.filelist -find $RPM_BUILD_ROOT/usr/src/debug/%{name}-%{version}-%{glibcdate} -type d \ +find $RPM_BUILD_ROOT/usr/src/debug/%{glibcsrcdir} -type d \ | sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfocommon.filelist ( cat $csf.sorted; grep -v -f $csf.sorted.build $sf.sorted ) \ | grep -v 'dl-osinfo\.h' | LC_ALL=C sort -u \ @@ -1087,7 +1088,7 @@ find $RPM_BUILD_ROOT/usr/src/debug/%{name}-%{version}-%{glibcdate} -type d \ %endif %else cat $blf $cblf | LC_ALL=C sort -u > debuginfo.filelist -echo '/usr/src/debug/%{name}-%{version}-%{glibcdate}' >> debuginfo.filelist +echo '/usr/src/debug/%{glibcsrcdir}' >> debuginfo.filelist %endif [ "x$save_trace" = xyes ] && set -x |