From b37a1b093b6e8c78032653c3ff01455457834ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]>
Date: Tue, 12 Jan 2016 11:11:07 +0100
Subject: Fix pkgconfig output concatenation with pkgconfig-0.29

---
 Pango-1.226-fix-pangocairo_libs.patch | 18 ++++++++++++++++++
 perl-Pango.spec                       |  8 +++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 Pango-1.226-fix-pangocairo_libs.patch

diff --git a/Pango-1.226-fix-pangocairo_libs.patch 
b/Pango-1.226-fix-pangocairo_libs.patch
new file mode 100644
index 0000000..91d6ec3
--- /dev/null
+++ b/Pango-1.226-fix-pangocairo_libs.patch
@@ -0,0 +1,18 @@
+From: bitcardbmw [...] lsmod.de
+
+When constructing the $libs variable, there is a blank missing
+before the -lpangocairo-1.0 coming from the pangocairo.pc through
+pkg-config. Inserting an extra blank before the pkg-config
+result fixes the issue.
+
+CPAN RT#111117
+--- Makefile.PL        2014-02-19 05:13:50.000000000 +0100
++++ Makefile.PL        2015-10-08 00:47:59.777157391 +0200
+@@ -161,6 +161,7 @@
+ if ($have_cairo) {
+       push @deps, qw/Cairo/;
+       $inc .= $pangocairo_pkgcfg{cflags};
++      $libs .= ' ';
+       $libs .= $pangocairo_pkgcfg{libs};
+ }
+ 
diff --git a/perl-Pango.spec b/perl-Pango.spec
index 66dce39..3798fd1 100644
--- a/perl-Pango.spec
+++ b/perl-Pango.spec
@@ -1,11 +1,13 @@
 Name:           perl-Pango
 Version:        1.226
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Perl interface to the pango library
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://search.cpan.org/dist/Pango/
 Source0:        
http://www.cpan.org/authors/id/T/TS/TSCH/Pango-%{version}.tar.gz
+# Fix pkgconfig output concatenation with pkgconfig-0.29, bug #1297705
+Patch0:         Pango-1.226-fix-pangocairo_libs.patch
 BuildRequires:  perl(ExtUtils::Depends) >= 0.300 
 BuildRequires:  perl(ExtUtils::PkgConfig)
 BuildRequires:  perl(Cairo) >= 1.000
@@ -25,6 +27,7 @@ complete solution with high quality text handling and 
graphics rendering.
 
 %prep
 %setup -q -n Pango-%{version}
+%patch0 -p0
 %{?perl_default_filter}
 
 chmod -c a-x examples/*.pl
@@ -52,6 +55,9 @@ chmod -R u+w $RPM_BUILD_ROOT/*
 %{_mandir}/man3/*.3pm*
 
 %changelog
+* Tue Jan 12 2016 Petr Pisar <[email protected]> - 1.226-6
+- Fix pkgconfig output concatenation with pkgconfig-0.29 (bug #1297705)
+
 * Thu Jun 18 2015 Fedora Release Engineering <[email protected]> 
- 1.226-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-- 
cgit v0.11.2


        
http://pkgs.fedoraproject.org/cgit/perl-Pango.git/commit/?h=master&id=b37a1b093b6e8c78032653c3ff01455457834ced
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
[email protected]
http://lists.fedoraproject.org/admin/lists/[email protected]

Reply via email to