rpms/rpm/F-7 rpm.spec,1.232,1.233

[Panu Matilainen (pmatilai)]

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20945

Modified Files:
	rpm.spec 
Log Message:
- pull in updated config.guess to get _host macro correct (#259761)
- explicitly buildrequire redhat-rpm-config for the config.guess hack



Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/F-7/rpm.spec,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- rpm.spec	3 Oct 2007 13:10:12 -0000	1.232
+++ rpm.spec	3 Oct 2007 13:42:32 -0000	1.233
@@ -40,6 +40,9 @@
 Requires: crontabs
 Requires: logrotate
 
+# explicit due to config.guess hackery
+BuildRequires: redhat-rpm-config
+
 BuildRequires: autoconf
 BuildRequires: elfutils-devel >= 0.112
 BuildRequires: elfutils-libelf-devel-static
@@ -159,6 +162,12 @@
 
 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
 ./configure --prefix=%{__prefix} --sysconfdir=/etc \
         --localstatedir=/var --infodir='${prefix}%{__share}/info' \
@@ -450,6 +459,8 @@
 %changelog
 * Wed Oct 03 2007 Panu Matilainen <pmatilai at redhat.com> 
 - 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 at redhat.com> - 4.4.2.1-1
 - update to 4.4.2.1 (#247749 and others)