From c16b5ef5c863594ab96d704e33781d60673e5e39e194a6431356609f56ddad14 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 7 Aug 2018 07:30:15 +0000 Subject: [PATCH] Accepting request 627809 from home:Andreas_Schwab:Factory - remove-backref-alt-test.patch: Remove backref-alt test which fails or not depending on glibc version OBS-URL: https://build.opensuse.org/request/show/627809 OBS-URL: https://build.opensuse.org/package/show/Base:System/grep?expand=0&rev=87 --- grep.changes | 6 ++++++ grep.spec | 4 +++- remove-backref-alt-test.patch | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 remove-backref-alt-test.patch diff --git a/grep.changes b/grep.changes index ff5eedb..7fe319e 100644 --- a/grep.changes +++ b/grep.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 7 07:08:30 UTC 2018 - schwab@suse.de + +- remove-backref-alt-test.patch: Remove backref-alt test which fails or + not depending on glibc version + ------------------------------------------------------------------- Thu Feb 22 15:10:33 UTC 2018 - fvogt@suse.com diff --git a/grep.spec b/grep.spec index 6958f3f..f3ae78a 100644 --- a/grep.spec +++ b/grep.spec @@ -20,12 +20,13 @@ Name: grep Version: 3.1 Release: 0 Summary: Print lines matching a pattern -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Text/Utilities Url: https://www.gnu.org/software/grep/ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source2: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source3: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=grep&download=1#/%{name}.keyring +Patch0: remove-backref-alt-test.patch BuildRequires: fdupes BuildRequires: makeinfo BuildRequires: pcre-devel @@ -42,6 +43,7 @@ match to a specified pattern. By default, grep prints the matching lines. %prep %setup -q +%patch0 -p1 %build %configure \ diff --git a/remove-backref-alt-test.patch b/remove-backref-alt-test.patch new file mode 100644 index 0000000..339f227 --- /dev/null +++ b/remove-backref-alt-test.patch @@ -0,0 +1,24 @@ +Index: grep-3.1/tests/Makefile.am +=================================================================== +--- grep-3.1.orig/tests/Makefile.am ++++ grep-3.1/tests/Makefile.am +@@ -63,7 +63,6 @@ endif + + TESTS = \ + backref \ +- backref-alt \ + backref-multibyte-slow \ + backref-word \ + backslash-s-and-repetition-operators \ +Index: grep-3.1/tests/Makefile.in +=================================================================== +--- grep-3.1.orig/tests/Makefile.in ++++ grep-3.1/tests/Makefile.in +@@ -1411,7 +1411,6 @@ LDADD = ../lib/libgreputils.a $(LIBINTL) + XFAIL_TESTS = triple-backref $(am__append_1) $(am__append_2) + TESTS = \ + backref \ +- backref-alt \ + backref-multibyte-slow \ + backref-word \ + backslash-s-and-repetition-operators \