diff --git a/gdk-pixbuf.changes b/gdk-pixbuf.changes index 6fb82e5..2ecf899 100644 --- a/gdk-pixbuf.changes +++ b/gdk-pixbuf.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Aug 22 13:25:02 UTC 2017 - dimstar@opensuse.org + +- Migrate to meosn build system: + + Add meson BuildRequires: new dependency. + + Add xsltproc, gdk-doc and docbook-xsl-stylesheets + BuildRequires: new dependencies, as gtk-doc and man pages are + no longer pre-built. + + Replace configure, make, make_install calls for respective + meson, meson_build and meson_install macros. +- Drop libjasper-devel BuildRequires: drop JPEG2000 support: it is + not enabled per default by upstream. + ------------------------------------------------------------------- Sat Aug 19 17:37:46 UTC 2017 - zaitor@opensuse.org diff --git a/gdk-pixbuf.spec b/gdk-pixbuf.spec index 34f0d82..3d308b0 100644 --- a/gdk-pixbuf.spec +++ b/gdk-pixbuf.spec @@ -18,7 +18,6 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gdk_pixbuf_binary_version 2.10.0 - Name: gdk-pixbuf Version: 2.36.9 Release: 0 @@ -32,16 +31,20 @@ Source2: README.SUSE Source99: baselibs.conf # PATCH-FIX-UPSTREAM u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch boo#929462 bsc#1010497 bgo#775896 mstaudt@suse.com -- Fix RGBA conversion for big endian X11 environments Patch0: u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch -BuildRequires: libjasper-devel +BuildRequires: docbook-xsl-stylesheets +BuildRequires: gtk-doc BuildRequires: libjpeg-devel BuildRequires: libtiff-devel -%if !0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +BuildRequires: meson +BuildRequires: pkgconfig +BuildRequires: xsltproc BuildRequires: pkgconfig(glib-2.0) >= 2.48.0 BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(x11) +%if !0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description gdk-pixbuf is an image loading library that can be extended by loadable @@ -52,10 +55,10 @@ Clutter. Summary: An image loading library # Provide %%{name} to make the lang package installable Group: System/Libraries -Provides: %{name} = %{version} Requires(post): gdk-pixbuf-query-loaders Recommends: %{name}-lang = %{version} Conflicts: gtk2 < 2.21.3 +Provides: %{name} = %{version} %description -n libgdk_pixbuf-2_0-0 gdk-pixbuf is an image loading library that can be extended by loadable @@ -111,6 +114,7 @@ Clutter. This package contains development files for gdk-pixbuf. %lang_package + %prep %setup -q %if !0%{?is_opensuse} @@ -118,20 +122,16 @@ translation-update-upstream %endif %patch0 -p1 %if "%_lib" == "lib64" -cp -a %{S:2} . +cp -a %{SOURCE2} . %endif %build -%configure \ - --disable-static \ - --enable-introspection \ - --with-libjasper \ - --with-x11 -%{__make} %{?_smp_mflags} +%meson -D with_docs=true +%meson_build %install -%makeinstall -find %{buildroot}%{_libdir} -name '*.la' -delete -print +%meson_install +rm -rf %{buildroot}{%{_libexecdir},%{_datadir}}/installed-tests/ %find_lang %{name} touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache %if "%_lib" == "lib64" @@ -140,7 +140,7 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders %endif # Install rpm macros mkdir -p %{buildroot}%{_sysconfdir}/rpm -cp %{S:1} %{buildroot}%{_sysconfdir}/rpm +cp %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm ########################################################################### # Note: when updating scriptlets, don't forget to also update baselibs.conf