From a7a5be9af016c6026d1cc86cf81854ee9311ac420d49f80d447c858d21af5279 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 21 Jul 2015 11:24:01 +0000 Subject: [PATCH] Accepting request 315201 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/315201 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/diffutils?expand=0&rev=31 --- diffutils.changes | 5 +++++ diffutils.spec | 4 +++- gnulib-perl522.patch | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gnulib-perl522.patch diff --git a/diffutils.changes b/diffutils.changes index 71a7dd1..f971e58 100644 --- a/diffutils.changes +++ b/diffutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 6 10:13:58 UTC 2015 - coolo@suse.com + +- add gnulib-perl522.patch from gnulib upstream + ------------------------------------------------------------------- Sat Jan 3 15:25:32 UTC 2015 - meissner@suse.com diff --git a/diffutils.spec b/diffutils.spec index 78e0c90..cbeaf91 100644 --- a/diffutils.spec +++ b/diffutils.spec @@ -1,7 +1,7 @@ # # spec file for package diffutils # -# 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 @@ -30,6 +30,7 @@ Source: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz Source1: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig # http://savannah.gnu.org/project/memberlist-gpgkeys.php?group=diffutils Source2: %name.keyring +Patch0: gnulib-perl522.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # will be check by source service #BuildRequires: gpg-offline @@ -41,6 +42,7 @@ make source code patches, for instance. %prep %setup -q +%patch0 -p1 %build export CFLAGS="%optflags -fPIE" diff --git a/gnulib-perl522.patch b/gnulib-perl522.patch new file mode 100644 index 0000000..e15505b --- /dev/null +++ b/gnulib-perl522.patch @@ -0,0 +1,15 @@ +Subject: http://comments.gmane.org/gmane.comp.lib.gnulib.bugs/35272 + +Index: grep-2.21/build-aux/update-copyright +=================================================================== +--- grep-2.21.orig/build-aux/update-copyright ++++ grep-2.21/build-aux/update-copyright +@@ -124,7 +124,7 @@ use strict; + use warnings; + + my $copyright_re = 'Copyright'; +-my $circle_c_re = '(?:\([cC]\)|@copyright{}|©)'; ++my $circle_c_re = '(?:\([cC]\)|@copyright\{}|©)'; + my $holder = $ENV{UPDATE_COPYRIGHT_HOLDER}; + $holder ||= 'Free Software Foundation, Inc.'; + my $prefix_max = 5;