diff --git a/pango-fix-multilib.patch b/pango-fix-multilib.patch new file mode 100644 index 0000000..c805f2d --- /dev/null +++ b/pango-fix-multilib.patch @@ -0,0 +1,25 @@ +From 3a9eb6021d4367d045fe9f62917670e6b814b218 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Tue, 29 Aug 2017 19:55:51 +0900 +Subject: [PATCH] Fix multilib issue in pango-enum-types.h.template + +--- + pango/pango-enum-types.h.template | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pango/pango-enum-types.h.template b/pango/pango-enum-types.h.template +index 5fb54ced..c26679ea 100644 +--- a/pango/pango-enum-types.h.template ++++ b/pango/pango-enum-types.h.template +@@ -11,7 +11,7 @@ G_BEGIN_DECLS + + /*** BEGIN file-production ***/ + +-/* enumerations from "@filename@" */ ++/* enumerations from "@basename@" */ + /*** END file-production ***/ + + /*** BEGIN value-header ***/ +-- +2.13.5 + diff --git a/pango.spec b/pango.spec index 716d1e9..b47a9a4 100644 --- a/pango.spec +++ b/pango.spec @@ -8,7 +8,7 @@ Name: pango Version: 1.40.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: System for layout and rendering of internationalized text License: LGPLv2+ @@ -28,6 +28,8 @@ BuildRequires: gtk-doc BuildRequires: help2man BuildRequires: meson +Patch1: %{name}-fix-multilib.patch + Requires: glib2%{?_isa} >= %{glib2_version} Requires: freetype%{?_isa} >= %{freetype_version} Requires: fontconfig%{?_isa} >= %{fontconfig_version} @@ -71,6 +73,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n pango-%{version} +%patch1 -p1 -b .multilib %build @@ -125,8 +128,8 @@ fi %changelog -* Mon Aug 28 2017 Akira TAGOH - 1.40.11-2 -- Keep the timestamp for pango-enum-types.h (#1485076) +* Tue Aug 29 2017 Akira TAGOH - 1.40.11-3 +- Fix multilib issue (#1485076) * Sat Aug 19 2017 Kalev Lember - 1.40.11-1 - Update to 1.40.11