diff --git a/findutils.changes b/findutils.changes index ed799b2..6a038e6 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 6 10:19:01 UTC 2015 - coolo@suse.com + +- add gnulib-perl522.patch from gnulib upstream + ------------------------------------------------------------------- Tue Jan 6 16:44:55 UTC 2015 - mail@bernhard-voelker.de diff --git a/findutils.spec b/findutils.spec index 755b316..073c789 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ # # spec file for package findutils # -# 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 @@ Patch0: findutils-4.4.2-xautofs.patch Patch1: findutils-gnulib-ppc64le.patch # Upstream patch to fix a problem in oldfind(1) skipping files starting with "..". Patch2: findutils-oldfind-fix-dotdot-skipping.patch +Patch3: gnulib-perl522.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # BuildRequire dejagnu for 'runtest' to execute all tests. @@ -62,6 +63,7 @@ useful for finding things on your system. %patch0 %patch1 %patch2 +%patch3 -p1 %build %if 0%{?qemu_user_space_build} 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;