From f33912b148e1cd8b234f90488edb64cc5dcaf134 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 4 Nov 2019 13:39:46 +0100 Subject: [PATCH] Update to 0.1.72 - Switch to meson build system - Build with gobject-introspection support --- .gitignore | 1 + babl.spec | 39 +++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 538c45d..c57daba 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ babl-0.1.2.tar.bz2 /babl-0.1.60.tar.bz2 /babl-0.1.62.tar.bz2 /babl-0.1.66.tar.bz2 +/babl-0.1.72.tar.xz diff --git a/babl.spec b/babl.spec index dee322f..f2899c2 100644 --- a/babl.spec +++ b/babl.spec @@ -18,8 +18,8 @@ Summary: A dynamic, any to any, pixel format conversion library Name: babl -Version: 0.1.66 -Release: 2%{?dist} +Version: 0.1.72 +Release: 1%{?dist} # Compute some version related macros # Ugly hack, you need to get your quoting backslashes/percent signs straight @@ -31,12 +31,13 @@ Release: 2%{?dist} # The gggl codes contained in this package are under the GPL, with exceptions allowing their use under libraries covered under the LGPL License: LGPLv3+ and GPLv3+ URL: http://www.gegl.org/babl/ -Source0: https://download.gimp.org/pub/babl/%{apiver}/%{name}-%{version}.tar.bz2 +Source0: https://download.gimp.org/pub/babl/%{apiver}/%{name}-%{version}.tar.xz +BuildRequires: gcc +BuildRequires: gobject-introspection-devel BuildRequires: librsvg2 +BuildRequires: meson BuildRequires: pkgconfig(lcms2) -BuildRequires: automake, autoconf -BuildRequires: gcc %description Babl is a dynamic, any to any, pixel format conversion library. It @@ -73,22 +74,15 @@ This package contains documentation needed for developing with %{name}. %autosetup -p1 %build -# use PIC/PIE because babl is likely to deal with data coming from untrusted -# sources -CFLAGS="-fPIC %optflags -fno-strict-aliasing" -LDFLAGS="-pie" -%configure --disable-static - -make V=1 %{?_smp_mflags} +%meson +%meson_build %install -make DESTDIR=%{buildroot} install INSTALL='install -p' +%meson_install mkdir -p "%{buildroot}/%{develdocdir}" cp -pr docs/graphics docs/*.html docs/babl.css "%{buildroot}/%{develdocdir}" -rm -rf "%{buildroot}/%{develdocdir}"/graphics/Makefile* - -find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' +rm -f "%{buildroot}/%{develdocdir}"/graphics/meson.build %check # skip tests known to be problematic in a specific version @@ -104,24 +98,33 @@ EOF done popd %endif -make check +%meson_test %ldconfig_scriptlets %files -%doc AUTHORS COPYING README NEWS +%doc AUTHORS COPYING NEWS %{_libdir}/*.so.* %{_libdir}/babl-%{apiver}/ +%dir %{_libdir}/girepository-1.0/ +%{_libdir}/girepository-1.0/Babl-0.1.typelib %files devel %{_includedir}/babl-%{apiver}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%dir %{_datadir}/gir-1.0/ +%{_datadir}/gir-1.0/Babl-0.1.gir %files devel-docs %doc %{develdocdir} %changelog +* Mon Nov 04 2019 Kalev Lember - 0.1.72-1 +- Update to 0.1.72 +- Switch to meson build system +- Build with gobject-introspection support + * Wed Jul 24 2019 Fedora Release Engineering - 0.1.66-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 6a80bb8..f387696 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (babl-0.1.66.tar.bz2) = 41534eea6cad21eae704af3fdce4857e9dc2b0efa48a7cfd7f98b23428198e95fc9ca2f30e522abf2fa06e907eaf4f7bbafc048b356cb5890fabcb9be21001b3 +SHA512 (babl-0.1.72.tar.xz) = 55425688467d565acecbe3657ed4191971fe70d0da0f69c348eec8a6db9807f3e27f5101cade2d886d017b5156e4ef56382df93f26cc335acb4ce33bbef23d6b