- Switch back to manual config.guess/sub copies for reproducability

- Replace config.guess/sub from %%configure again (#951442)
This commit is contained in:
Panu Matilainen 2013-04-22 14:14:06 +03:00
parent 5ec4cc65c2
commit 9c8971c1cd
4 changed files with 30 additions and 4 deletions

2
.gitignore vendored
View File

@ -1 +1,3 @@
redhat-rpm-config-9.1.0.tar.bz2 redhat-rpm-config-9.1.0.tar.bz2
/config.guess
/config.sub

View File

@ -0,0 +1,13 @@
diff -up redhat-rpm-config-9.1.0/macros.configfoo redhat-rpm-config-9.1.0/macros
--- redhat-rpm-config-9.1.0/macros.configfoo 2013-04-22 13:42:25.984613491 +0300
+++ redhat-rpm-config-9.1.0/macros 2013-04-22 13:43:27.053420367 +0300
@@ -33,6 +33,9 @@
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags -I%_fmoddir}" ; export FFLAGS ; \
LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS; \
+ 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 ; \
%{_configure} --build=%{_build} --host=%{_host} \\\
--program-prefix=%{?_program_prefix} \\\
--disable-dependency-tracking \\\

View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 9.1.0 Version: 9.1.0
Release: 41%{?dist} Release: 42%{?dist}
# No version specified. # No version specified.
License: GPL+ License: GPL+
Group: Development/System Group: Development/System
@ -15,6 +15,10 @@ Source: redhat-rpm-config-%{version}.tar.bz2
Source1: redhat-hardened-cc1 Source1: redhat-hardened-cc1
Source2: redhat-hardened-ld Source2: redhat-hardened-ld
# up-to-date copies of config.guess and config.sub (from automake 1.13.1)
Source10: config.guess
Source11: config.sub
Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
Patch1: redhat-rpm-config-9.1.0-fix-requires.patch Patch1: redhat-rpm-config-9.1.0-fix-requires.patch
Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch
@ -47,6 +51,8 @@ Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=951669 # https://bugzilla.redhat.com/show_bug.cgi?id=951669
Patch18: redhat-rpm-config-9.1.0-record-switches.patch Patch18: redhat-rpm-config-9.1.0-record-switches.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=951442
Patch19: redhat-rpm-config-9.1.0-configfoo.patch
BuildArch: noarch BuildArch: noarch
Requires: coreutils Requires: coreutils
Requires: perl-srpm-macros Requires: perl-srpm-macros
@ -54,7 +60,6 @@ Requires: rpm >= 4.8.0
Requires: dwz >= 0.4 Requires: dwz >= 0.4
Requires: zip Requires: zip
Provides: system-rpm-config = %{version}-%{release} Provides: system-rpm-config = %{version}-%{release}
BuildRequires: libtool
%description %description
Red Hat specific rpm configuration files. Red Hat specific rpm configuration files.
@ -80,13 +85,14 @@ Red Hat specific rpm configuration files.
%patch16 -p1 %patch16 -p1
%patch17 -p1 %patch17 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1
%build %build
%install %install
make DESTDIR=${RPM_BUILD_ROOT} install make DESTDIR=${RPM_BUILD_ROOT} install
cp -p %{_datadir}/libtool/config/config.{guess,sub} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat/
install -m 0444 %{SOURCE1} %{SOURCE2} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat install -m 0444 %{SOURCE1} %{SOURCE2} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat
install -m 0775 %{SOURCE10} %{SOURCE11} ${RPM_BUILD_ROOT}/usr/lib/rpm/redhat
find ${RPM_BUILD_ROOT} -name \*.orig -delete find ${RPM_BUILD_ROOT} -name \*.orig -delete
# buggy makefile in 9.1.0 leaves changelog in wrong place # buggy makefile in 9.1.0 leaves changelog in wrong place
find ${RPM_BUILD_ROOT} -name ChangeLog -delete find ${RPM_BUILD_ROOT} -name ChangeLog -delete
@ -101,6 +107,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/* %{_sysconfdir}/rpm/*
%changelog %changelog
* Mon Apr 22 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-42
- Switch back to manual config.guess/sub copies for reproducability
- Replace config.guess/sub from %%configure again (#951442)
* Mon Apr 22 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-41 * Mon Apr 22 2013 Panu Matilainen <pmatilai@redhat.com> - 9.1.0-41
- Add -grecord-gcc-switches to global CFLAGS (#951669) - Add -grecord-gcc-switches to global CFLAGS (#951669)

View File

@ -1 +1,2 @@
3b71c9d0ccc938989778e3c3892e6b94 redhat-rpm-config-9.1.0.tar.bz2 9c01fa8c4554cb2c7b92c95dfa0dbfcf config.guess
1803a1d601bcf4debccfe2902c4f0f65 config.sub