Update to 1.40.12

This commit is contained in:
Kalev Lember 2017-09-05 11:23:27 +02:00
parent 0ebbf44557
commit 04a92c3ade
4 changed files with 7 additions and 32 deletions

1
.gitignore vendored
View File

@ -51,3 +51,4 @@ pango-1.28.1.tar.bz2
/pango-1.40.9.tar.xz
/pango-1.40.10.tar.xz
/pango-1.40.11.tar.xz
/pango-1.40.12.tar.xz

View File

@ -1,25 +0,0 @@
From 3a9eb6021d4367d045fe9f62917670e6b814b218 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
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

View File

@ -7,8 +7,8 @@
%global libXft_version 2.0.0
Name: pango
Version: 1.40.11
Release: 3%{?dist}
Version: 1.40.12
Release: 1%{?dist}
Summary: System for layout and rendering of internationalized text
License: LGPLv2+
@ -28,8 +28,6 @@ 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}
@ -73,14 +71,12 @@ the functionality of the installed %{name} package.
%prep
%setup -q -n pango-%{version}
%patch1 -p1 -b .multilib
%build
%meson -Denable_docs=true
%meson_build
touch -r pango/pango-enum-types.h.template pango/pango-enum-types.h
%install
%meson_install
@ -128,6 +124,9 @@ fi
%changelog
* Tue Sep 05 2017 Kalev Lember <klember@redhat.com> - 1.40.12-1
- Update to 1.40.12
* Tue Aug 29 2017 Akira TAGOH <tagoh@redhat.com> - 1.40.11-3
- Fix multilib issue (#1485076)

View File

@ -1 +1 @@
SHA512 (pango-1.40.11.tar.xz) = e4ac40f8da9c326e1e4dfaf4b1d2070601b17f88f5a12991a9a8bbc58bb08640404e2a794a5c68c5ebb2e7e80d9c186d4b26cd417bb63a23f024ef8a38bb152a
SHA512 (pango-1.40.12.tar.xz) = 772792edac9ab5b6f76617cd3512432ca6b9af1d5ee6bfb87d0b60293f560026d479df059da66f53ba567f916a275e82f1cdd17ca75bb0da7ae2a79d4a75ed6d