From 48dc4d694ee7cbec160500dd889dfd1e6b2729d4254bcbad3c283c310798127a Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Thu, 26 Mar 2015 13:30:45 +0000 Subject: [PATCH 1/2] Accepting request 293266 from home:rguenther:branches:Base:System - For openSUSE > 13.2 drop coreutils-build-timeout-as-pie.patch and instead add a BuildRequire for gcc-PIE. OBS-URL: https://build.opensuse.org/request/show/293266 OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=250 --- coreutils-testsuite.spec | 2 +- coreutils.changes | 6 ++++++ coreutils.spec | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec index 141b245..9766d43 100644 --- a/coreutils-testsuite.spec +++ b/coreutils-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package coreutils-testsuite # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/coreutils.changes b/coreutils.changes index 186b3a0..842be32 100644 --- a/coreutils.changes +++ b/coreutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 26 13:06:58 UTC 2015 - rguenther@suse.com + +- For openSUSE > 13.2 drop coreutils-build-timeout-as-pie.patch and + instead add a BuildRequire for gcc-PIE. + ------------------------------------------------------------------- Thu Feb 5 06:58:52 UTC 2015 - mail@bernhard-voelker.de diff --git a/coreutils.spec b/coreutils.spec index 41cd78e..87e9366 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -1,7 +1,7 @@ # # spec file for package coreutils # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,6 +42,9 @@ BuildRequires: libselinux-devel BuildRequires: makeinfo BuildRequires: perl BuildRequires: xz +%if %{suse_version} > 1320 +BuildRequires: gcc-PIE +%endif %if "%{name}" == "coreutils-testsuite" BuildRequires: acl BuildRequires: gdb @@ -174,7 +177,9 @@ the GNU fileutils, sh-utils, and textutils packages. %patch8 %patch16 # +%if %{suse_version} <= 1320 %patch100 +%endif %patch111 %patch112 %patch113 From b9f0df4c01db654b8171f4a767b5f03b18391d50cf03945c61427cfcd5c12f71 Mon Sep 17 00:00:00 2001 From: Bernhard Voelker Date: Thu, 26 Mar 2015 13:47:15 +0000 Subject: [PATCH 2/2] - Run ./pre_checkin.sh to update "coreutils-testsuite.spec". OBS-URL: https://build.opensuse.org/package/show/Base:System/coreutils?expand=0&rev=251 --- coreutils-testsuite.changes | 6 ++++++ coreutils-testsuite.spec | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/coreutils-testsuite.changes b/coreutils-testsuite.changes index 186b3a0..842be32 100644 --- a/coreutils-testsuite.changes +++ b/coreutils-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 26 13:06:58 UTC 2015 - rguenther@suse.com + +- For openSUSE > 13.2 drop coreutils-build-timeout-as-pie.patch and + instead add a BuildRequire for gcc-PIE. + ------------------------------------------------------------------- Thu Feb 5 06:58:52 UTC 2015 - mail@bernhard-voelker.de diff --git a/coreutils-testsuite.spec b/coreutils-testsuite.spec index 9766d43..ad5aa05 100644 --- a/coreutils-testsuite.spec +++ b/coreutils-testsuite.spec @@ -42,6 +42,9 @@ BuildRequires: libselinux-devel BuildRequires: makeinfo BuildRequires: perl BuildRequires: xz +%if %{suse_version} > 1320 +BuildRequires: gcc-PIE +%endif %if "%{name}" == "coreutils-testsuite" BuildRequires: acl BuildRequires: gdb @@ -174,7 +177,9 @@ the GNU fileutils, sh-utils, and textutils packages. %patch8 %patch16 # +%if %{suse_version} <= 1320 %patch100 +%endif %patch111 %patch112 %patch113