From c7db056ac1fbb7521afeaeb2cc4c54ed716277163dca58fa6f43153441bf0994 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 14 May 2018 11:03:08 +0000 Subject: [PATCH] Accepting request 607002 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/607002 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=41 --- intltool-no-guess-builddir.patch | 29 +++++++++++++++++++++++++++++ intltool.changes | 6 ++++++ intltool.spec | 3 +++ 3 files changed, 38 insertions(+) create mode 100644 intltool-no-guess-builddir.patch diff --git a/intltool-no-guess-builddir.patch b/intltool-no-guess-builddir.patch new file mode 100644 index 0000000..5fbaa14 --- /dev/null +++ b/intltool-no-guess-builddir.patch @@ -0,0 +1,29 @@ +--- intltool-0.51.0-orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100 ++++ intltool-0.51.0/intltool-update.in 2018-05-13 21:44:00.561217678 +0200 +@@ -620,6 +620,14 @@ + + my @result; + ++ # If the builddir is a subdir of srcdir, the list of files found will be prefixed with ++ # an additional prefix (e.g. "_build/sub" for automake 1.15 make distcheck). Try to ++ # handle that, by removing those matches as well. ++ my $absbuilddir = Cwd::abs_path("..\/"); ++ my $abssrcdir = Cwd::abs_path("$SRCDIR/.."); ++ # Check if builddir is a subdir of srcdir ++ my ($abspath,$relpath) = split /\s*$abssrcdir\/\s*/, $absbuilddir, 2; ++ + foreach (@buf_allfiles_sorted) + { + my $dummy = $_; +@@ -628,7 +636,10 @@ + $srcdir =~ s#^../##; + $dummy =~ s#^$srcdir/../##; + $dummy =~ s#^$srcdir/##; +- $dummy =~ s#_build/##; ++ if ($relpath) ++ { ++ $dummy =~ s#^$relpath/##; ++ } + if (!exists($in2{$dummy})) + { + push @result, $dummy diff --git a/intltool.changes b/intltool.changes index f30f21c..a9c272d 100644 --- a/intltool.changes +++ b/intltool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 13 19:47:44 UTC 2018 - bjorn.lie@gmail.com + +- Add intltool-no-guess-builddir.patch: Fix out of tree builds with + automake 1.15 and newer, patch taken from Ubuntu (lp#1117944). + ------------------------------------------------------------------- Wed Feb 28 16:33:35 UTC 2018 - dimstar@opensuse.org diff --git a/intltool.spec b/intltool.spec index 2090463..d7580fb 100644 --- a/intltool.spec +++ b/intltool.spec @@ -28,6 +28,8 @@ Source: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name} Patch0: intltool-perl-5.22.patch # PATCH-FIX-UPSTREAM fixrace.patch lp#1687644 boo#1021335 Patch1: fixrace.patch +# PATCH-FIX-UPSTREAM intltool-no-guess-builddir.patch lp#1117944 -- Fix out of tree builds with automake 1.15 +Patch2: intltool-no-guess-builddir.patch BuildRequires: perl-XML-Parser Requires: gettext-tools Requires: perl-XML-Parser @@ -45,6 +47,7 @@ information is written back into the XML files. %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build %configure