From fed157bf6e3550b7e18787193687272d4b0246b01c2d814101f4f28837e5a2ab Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 8 Nov 2012 12:16:12 +0000 Subject: [PATCH] [bug introduced in coreutils-8.11] (bnc#788459 gnu#12656) - Add the missing parts in coreutil.spec so that the testsuite is only run when coreutils-testsuite is built. Also add additional BuildRequires for the testsuite. [bug introduced in coreutils-8.11] (bnc#788459 gnu#12656) OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=165 --- coreutils-no_silent-rule.patch | 25 +++++++++++++++++++++++++ coreutils-testsuite.changes | 2 +- coreutils-testsuite.spec | 13 +++++++++++++ coreutils.changes | 9 ++++++++- coreutils.spec | 13 +++++++++++++ 5 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 coreutils-no_silent-rule.patch diff --git a/coreutils-no_silent-rule.patch b/coreutils-no_silent-rule.patch new file mode 100644 index 0000000..68edca4 --- /dev/null +++ b/coreutils-no_silent-rule.patch @@ -0,0 +1,25 @@ +From: Philipp Thomas +Date: 2012-11-08 13:06:34+01:00 +Subject: Remove AM_SILENT_RULES +References: +Upstream: + +This removes AM_SILENT_RULES so that autoreconf succeeds with older automake +versions. + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +Index: configure.ac +=================================================================== +--- configure.ac.orig 2012-11-08 12:57:12.224507908 +0100 ++++ configure.ac 2012-11-08 13:04:32.064100936 +0100 +@@ -33,7 +33,6 @@ AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) + + AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz color-tests parallel-tests]) +-AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. + + dnl POSIXCHECK is worthwhile for maintainers, but adds several seconds + dnl (more than 10% execution time) to ./configure, with no benefit for diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index bb08da0..58949ec 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -13,7 +13,7 @@ Sun Oct 28 20:31:28 UTC 2012 - mail@bernhard-voelker.de This could happen with a very fragmented and sparse input file, on GNU/Linux file systems supporting fiemap extent scanning. This bug also affects mv when it resorts to copying, and install. - [bug introduced in coreutils-8.11] + [bug introduced in coreutils-8.11] (bnc#788459 gnu#12656) ------------------------------------------------------------------- Fri Sep 21 11:55:12 UTC 2012 - froh@suse.com diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec index a559c2b..e513d92 100644 --- a/coreutils-testsuite.spec +++ b/coreutils-testsuite.spec @@ -27,6 +27,10 @@ BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: pam-devel +%if "%{name}" == "coreutils-testsuite" +BuildRequires: gdb +BuildRequires: perl-Expect +%endif BuildRequires: xz Url: http://www.gnu.org/software/coreutils/ Version: 8.17 @@ -77,6 +81,7 @@ Patch34: coreutils-acl-nofollow.patch Patch36: coreutils-basename_documentation.patch Patch37: coreutils-bnc#697897-setsid.patch Patch38: coreutils-cp-corrupt-fragmented-sparse.patch +Patch39: coreutils-no_silent-rule.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # this will create a cycle, broken up randomly - coreutils is just too core to have other # prerequires @@ -121,6 +126,9 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes %patch36 %patch37 %patch38 +%if 0%{suse_version} < 1200 +%patch39 +%endif xz -dc %{S:4} >po/de.po @@ -136,6 +144,11 @@ export CFLAGS="%optflags -Wall" make -C po update-po make %{?_smp_mflags} V=1 +%if "%{name}" == "coreutils-testsuite" +%check +make %{?_smp_mflags} check-very-expensive +%endif + %install %makeinstall pkglibexecdir=%{_libdir}/%{name} test -f %{buildroot}%{_bindir}/su || \ diff --git a/coreutils.changes b/coreutils.changes index bb08da0..4ee4a7a 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Nov 8 13:12:25 CET 2012 - pth@suse.de + +- Add the missing parts in coreutil.spec so that the testsuite is + only run when coreutils-testsuite is built. Also add additional + BuildRequires for the testsuite. + ------------------------------------------------------------------- Tue Nov 6 13:23:45 CET 2012 - pth@suse.de @@ -13,7 +20,7 @@ Sun Oct 28 20:31:28 UTC 2012 - mail@bernhard-voelker.de This could happen with a very fragmented and sparse input file, on GNU/Linux file systems supporting fiemap extent scanning. This bug also affects mv when it resorts to copying, and install. - [bug introduced in coreutils-8.11] + [bug introduced in coreutils-8.11] (bnc#788459 gnu#12656) ------------------------------------------------------------------- Fri Sep 21 11:55:12 UTC 2012 - froh@suse.com diff --git a/coreutils.spec b/coreutils.spec index bae2be2..df4c321 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -27,6 +27,10 @@ BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libselinux-devel BuildRequires: pam-devel +%if "%{name}" == "coreutils-testsuite" +BuildRequires: gdb +BuildRequires: perl-Expect +%endif BuildRequires: xz Url: http://www.gnu.org/software/coreutils/ Version: 8.17 @@ -77,6 +81,7 @@ Patch34: coreutils-acl-nofollow.patch Patch36: coreutils-basename_documentation.patch Patch37: coreutils-bnc#697897-setsid.patch Patch38: coreutils-cp-corrupt-fragmented-sparse.patch +Patch39: coreutils-no_silent-rule.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # this will create a cycle, broken up randomly - coreutils is just too core to have other # prerequires @@ -121,6 +126,9 @@ uname unexpand uniq unlink uptime users vdir wc who whoami yes %patch36 %patch37 %patch38 +%if 0%{suse_version} < 1200 +%patch39 +%endif xz -dc %{S:4} >po/de.po @@ -136,6 +144,11 @@ export CFLAGS="%optflags -Wall" make -C po update-po make %{?_smp_mflags} V=1 +%if "%{name}" == "coreutils-testsuite" +%check +make %{?_smp_mflags} check-very-expensive +%endif + %install %makeinstall pkglibexecdir=%{_libdir}/%{name} test -f %{buildroot}%{_bindir}/su || \