diff --git a/pango.spec b/pango.spec index 03472a6..3eeca00 100644 --- a/pango.spec +++ b/pango.spec @@ -1,5 +1,4 @@ %global glib2_version 2.33.12 -%global pkgconfig_version 0.12 %global freetype_version 2.1.5 %global fontconfig_version 2.10.91 %global cairo_version 1.12.10 @@ -9,14 +8,13 @@ Name: pango Version: 1.40.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: System for layout and rendering of internationalized text License: LGPLv2+ URL: http://www.pango.org Source0: http://download.gnome.org/sources/%{name}/1.40/%{name}-%{version}.tar.xz -BuildRequires: pkgconfig >= %{pkgconfig_version} BuildRequires: pkgconfig(cairo) >= %{cairo_version} BuildRequires: pkgconfig(freetype2) >= %{freetype_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -26,9 +24,9 @@ BuildRequires: pkgconfig(libthai) >= %{libthai_version} BuildRequires: pkgconfig(xft) >= %{libXft_version} BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: cairo-gobject-devel -# Bootstrap requirements -BuildRequires: gnome-common intltool gtk-doc +BuildRequires: gtk-doc BuildRequires: help2man +BuildRequires: meson Requires: glib2%{?_isa} >= %{glib2_version} Requires: freetype%{?_isa} >= %{freetype_version} @@ -74,25 +72,14 @@ the functionality of the installed %{name} package. %prep %setup -q -n pango-%{version} + %build - -# Force regeneration of the man page -rm -f pango-view/pango-view.1.in - -# We try hard to not link to libstdc++ -(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; - %configure $CONFIGFLAGS \ - --enable-doc-cross-references \ - --enable-installed-tests -) -make %{?_smp_mflags} V=1 +%meson -Denable_docs=true +%meson_build %install -%make_install - -# Remove files that should not be packaged -rm $RPM_BUILD_ROOT%{_libdir}/*.la +%meson_install PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so if ! test -e $PANGOXFT_SO; then @@ -137,6 +124,9 @@ fi %changelog +* Sat Aug 19 2017 Kalev Lember - 1.40.10-2 +- Switch to the meson build system + * Wed Aug 16 2017 Kalev Lember - 1.40.10-1 - Update to 1.40.10