Accepting request 607011 from GNOME:Factory

(forwarded request 607002 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/607011
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/intltool?expand=0&rev=36

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

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
 

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