- pull in updated config.guess to get _host macro correct (#259761)
- explicitly buildrequire redhat-rpm-config for the config.guess hack
This commit is contained in:
parent
db9aa25ce0
commit
e403a61579
11
rpm.spec
11
rpm.spec
|
@ -40,6 +40,9 @@ Requires: popt >= 1.10.2.1
|
||||||
Requires: crontabs
|
Requires: crontabs
|
||||||
Requires: logrotate
|
Requires: logrotate
|
||||||
|
|
||||||
|
# explicit due to config.guess hackery
|
||||||
|
BuildRequires: redhat-rpm-config
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: elfutils-devel >= 0.112
|
BuildRequires: elfutils-devel >= 0.112
|
||||||
BuildRequires: elfutils-libelf-devel-static
|
BuildRequires: elfutils-libelf-devel-static
|
||||||
|
@ -159,6 +162,12 @@ unset LD_ASSUME_KERNEL || :
|
||||||
|
|
||||||
WITH_PYTHON="--with-python=%{with_python_version}"
|
WITH_PYTHON="--with-python=%{with_python_version}"
|
||||||
|
|
||||||
|
# XXX pull in updated config.guess and config.sub as done by %%configure
|
||||||
|
# which cannot be used to build rpm itself due to makefile brokenness
|
||||||
|
for i in $(find . -name config.guess -o -name config.sub) ; do
|
||||||
|
[ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i
|
||||||
|
done
|
||||||
|
|
||||||
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
|
CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
|
||||||
./configure --prefix=%{__prefix} --sysconfdir=/etc \
|
./configure --prefix=%{__prefix} --sysconfdir=/etc \
|
||||||
--localstatedir=/var --infodir='${prefix}%{__share}/info' \
|
--localstatedir=/var --infodir='${prefix}%{__share}/info' \
|
||||||
|
@ -450,6 +459,8 @@ exit 0
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Oct 03 2007 Panu Matilainen <pmatilai@redhat.com>
|
* Wed Oct 03 2007 Panu Matilainen <pmatilai@redhat.com>
|
||||||
- add bunch of previously implicit dependencies for rpm-build (#316201)
|
- add bunch of previously implicit dependencies for rpm-build (#316201)
|
||||||
|
- pull in updated config.guess to get _host macro correct (#259761)
|
||||||
|
- explicitly buildrequire redhat-rpm-config for the config.guess hack
|
||||||
|
|
||||||
* Mon Aug 13 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-1
|
* Mon Aug 13 2007 Panu Matilainen <pmatilai@redhat.com> - 4.4.2.1-1
|
||||||
- update to 4.4.2.1 (#247749 and others)
|
- update to 4.4.2.1 (#247749 and others)
|
||||||
|
|
Loading…
Reference in New Issue