From 82ef0572e3188de9858b6addcd0fadf5b78965f4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 06 2018 09:11:36 +0000 Subject: Update to 2.38.0 - Switch to the meson build system --- diff --git a/.gitignore b/.gitignore index 295406a..bd3b35b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ gdk-pixbuf-2.21.6.tar.bz2 /gdk-pixbuf-2.36.10.tar.xz /gdk-pixbuf-2.36.11.tar.xz /gdk-pixbuf-2.36.12.tar.xz +/gdk-pixbuf-2.38.0.tar.xz diff --git a/gdk-pixbuf2.spec b/gdk-pixbuf2.spec index 6e22a20..1eb5219 100644 --- a/gdk-pixbuf2.spec +++ b/gdk-pixbuf2.spec @@ -1,20 +1,22 @@ %global glib2_version 2.48.0 Name: gdk-pixbuf2 -Version: 2.36.12 -Release: 2%{?dist} +Version: 2.38.0 +Release: 1%{?dist} Summary: An image loading library License: LGPLv2+ URL: http://www.gtk.org -#VCS: git:git://git.gnome.org/gdk-pixbuf -Source0: http://download.gnome.org/sources/gdk-pixbuf/2.36/gdk-pixbuf-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gdk-pixbuf/2.38/gdk-pixbuf-%{version}.tar.xz +BuildRequires: gettext +BuildRequires: gtk-doc BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: libtiff-devel BuildRequires: jasper-devel +BuildRequires: meson BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.3 # gdk-pixbuf does a configure time check which uses the GIO mime @@ -82,26 +84,18 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. - %prep %autosetup -n gdk-pixbuf-%{version} -p1 %build -%configure \ - --with-x11 \ - --with-libjasper \ - --with-included-loaders=png \ - --enable-installed-tests \ - --disable-silent-rules -make %{?_smp_mflags} +%meson -Dbuiltin_loaders=png \ + -Ddocs=true \ + -Djasper=true +%meson_build %install -%make_install RUN_QUERY_LOADER_TEST=false - -# Remove unpackaged files -rm $RPM_BUILD_ROOT%{_libdir}/*.la -rm $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.la +%meson_install touch $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache @@ -129,7 +123,7 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %files -f gdk-pixbuf.lang %license COPYING -%doc AUTHORS NEWS +%doc NEWS %{_libdir}/libgdk_pixbuf-2.0.so.* %{_libdir}/girepository-1.0 %dir %{_libdir}/gdk-pixbuf-2.0 @@ -167,8 +161,11 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache %{_libexecdir}/installed-tests %{_datadir}/installed-tests - %changelog +* Thu Sep 06 2018 Kalev Lember - 2.38.0-1 +- Update to 2.38.0 +- Switch to the meson build system + * Fri Jul 13 2018 Fedora Release Engineering - 2.36.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index e222810..893ad40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gdk-pixbuf-2.36.12.tar.xz) = 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b +SHA512 (gdk-pixbuf-2.38.0.tar.xz) = 10fcd7999dcff48d6e965306e208cc8ca324ba98f3f4f56755d015e96938bcfbfaadc56ed75142c037e3df34b04283cd4fdf043b32e3e091b32115fccde229f4