Hello community, here is the log from the commit of package intltool for openSUSE:Factory checked in at 2018-05-22 16:59:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/intltool (Old) and /work/SRC/openSUSE:Factory/.intltool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intltool" Tue May 22 16:59:51 2018 rev:36 rq:607011 version:0.51.0 Changes: -------- --- /work/SRC/openSUSE:Factory/intltool/intltool.changes 2018-03-08 10:46:39.656748575 +0100 +++ /work/SRC/openSUSE:Factory/.intltool.new/intltool.changes 2018-05-22 16:59:55.136686411 +0200 @@ -1,0 +2,6 @@ +Sun May 13 19:47:44 UTC 2018 - [email protected] + +- Add intltool-no-guess-builddir.patch: Fix out of tree builds with + automake 1.15 and newer, patch taken from Ubuntu (lp#1117944). + +------------------------------------------------------------------- New: ---- intltool-no-guess-builddir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intltool.spec ++++++ --- /var/tmp/diff_new_pack.okr0Ga/_old 2018-05-22 16:59:55.832661086 +0200 +++ /var/tmp/diff_new_pack.okr0Ga/_new 2018-05-22 16:59:55.832661086 +0200 @@ -28,6 +28,8 @@ 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 @@ %setup -q %patch0 %patch1 -p1 +%patch2 -p1 %build %configure ++++++ intltool-no-guess-builddir.patch ++++++ --- 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
