Hello community, here is the log from the commit of package intltool for openSUSE:Leap:15.2 checked in at 2020-03-06 12:37:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/intltool (Old) and /work/SRC/openSUSE:Leap:15.2/.intltool.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intltool" Fri Mar 6 12:37:06 2020 rev:17 rq:779597 version:0.51.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/intltool/intltool.changes 2020-01-15 15:12:22.238139022 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.intltool.new.26092/intltool.changes 2020-03-06 12:37:07.214605583 +0100 @@ -1,0 +2,11 @@ +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). + +------------------------------------------------------------------- +Wed Feb 28 16:33:35 UTC 2018 - [email protected] + +- Modernize spec-file by calling spec-cleaner + +------------------------------------------------------------------- New: ---- intltool-no-guess-builddir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ intltool.spec ++++++ --- /var/tmp/diff_new_pack.BRsS0G/_old 2020-03-06 12:37:07.542605783 +0100 +++ /var/tmp/diff_new_pack.BRsS0G/_new 2020-03-06 12:37:07.542605783 +0100 @@ -1,7 +1,7 @@ # # spec file for package intltool # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,24 +17,25 @@ Name: intltool -BuildRequires: perl-XML-Parser -Summary: Internationalization Tool Collection -License: GPL-2.0+ -Group: Development/Tools/Other Version: 0.51.0 Release: 0 -BuildArch: noarch -Requires: gettext-tools -Requires: perl-XML-Parser -Provides: xml-i18n-tools -Obsoletes: xml-i18n-tools -Url: https://edge.launchpad.net/intltool/ +Summary: Internationalization Tool Collection +License: GPL-2.0-or-later +Group: Development/Tools/Other +URL: https://edge.launchpad.net/intltool/ Source: https://launchpad.net/%{name}/trunk/%{version}/+download/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM intltool-perl-5.22.patch lp#1490906 [email protected] -- Fix execution with perl 5.22 Patch0: intltool-perl-5.22.patch # PATCH-FIX-UPSTREAM fixrace.patch lp#1687644 boo#1021335 Patch1: fixrace.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# 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 +Provides: xml-i18n-tools +Obsoletes: xml-i18n-tools +BuildArch: noarch %description Some scripts to support translators working on GNOME and similar @@ -44,32 +45,29 @@ %prep %setup -q -%patch0 -p0 +%patch0 %patch1 -p1 +%patch2 -p1 %build %configure -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install -%makeinstall - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install %files -%defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%defattr(-, root, root) +%license COPYING +%doc AUTHORS ChangeLog NEWS README TODO %{_bindir}/intltool-* %{_bindir}/intltoolize %dir %{_datadir}/aclocal %{_datadir}/aclocal/intltool.m4 %{_datadir}/%{name}/ -%doc %{_mandir}/man8/intltool-*.8%{?ext_man} -%doc %{_mandir}/man8/intltoolize.8%{?ext_man} +%{_mandir}/man8/intltool-*.8%{?ext_man} +%{_mandir}/man8/intltoolize.8%{?ext_man} %changelog ++++++ 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
