rpms/intltool
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix usage of distcheck for some packages rhbz (#1318674)

Browse Source
This commit is contained in:
raveit65 2016-07-29 14:22:30 +02:00
parent 4f34106a98
commit 6c129f09a9
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intltool.spec
View File

@ -1,7 +1,7 @@
Name: intltool
Summary: Utility for internationalizing various kinds of data files
Version: 0.51.0
Release: 6%{?dist}
Release: 7%{?dist}
License: GPLv2 with exceptions
Group: Development/Tools
#VCS: bzr:https://code.edge.launchpad.net/~intltool/intltool/trunk
@ -27,6 +27,8 @@ Patch1: intltool-0.51.0-perl-5.22.patch
# https://bugs.launchpad.net/intltool/+bug/1505260
# https://bugzilla.redhat.com/show_bug.cgi?id=1249051
Patch2: intltool-merge-Create-cache-file-atomically.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1318674
Patch3: intltool_distcheck-fix.patch
%description
This tool automatically extracts translatable strings from oaf, glade,
@ -37,6 +39,7 @@ them in the po files.
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure
@ -64,6 +67,9 @@ fi
%{_mandir}/man8/intltool*.8*
%changelog
* Fri Jul 29 2016 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.51.0-7
- fix usage of distcheck for some packages rhbz (#1318674)
* Tue Feb 16 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 0.51.0-6
- Depend on perl(Getopt::Long) (#1307638)

30
intltool_distcheck-fix.patch Normal file
View File

@ -0,0 +1,30 @@
diff -upr intltool-0.51.0-orig/intltool-update.in intltool-0.51.0/intltool-update.in
--- intltool-0.51.0-orig/intltool-update.in 2016-07-29 14:08:06.276987000 +0200
+++ intltool-0.51.0/intltool-update.in 2016-07-29 14:11:09.562126918 +0200
@@ -620,6 +620,14 @@ sub FindLeftoutFiles
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 @@ sub FindLeftoutFiles
$srcdir =~ s#^../##;
$dummy =~ s#^$srcdir/../##;
$dummy =~ s#^$srcdir/##;
- $dummy =~ s#_build/##;
+ if ($relpath)
+ {
+ $dummy =~ s#^$relpath/##;
+ }
if (!exists($in2{$dummy}))
{
push @result, $dummy