Accepting request 519621 from GNOME:Next

- 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.

OBS-URL: https://build.opensuse.org/request/show/519621
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=138
This commit is contained in:
Dominique Leuenberger 2017-08-31 07:45:44 +00:00 committed by Git OBS Bridge
parent fbe8bc87fa
commit 99b5bbef2e
2 changed files with 29 additions and 16 deletions

View File

@ -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 Sat Aug 19 17:37:46 UTC 2017 - zaitor@opensuse.org

View File

@ -18,7 +18,6 @@
# When updating the binary version, do not forget to also update baselibs.conf # When updating the binary version, do not forget to also update baselibs.conf
%define gdk_pixbuf_binary_version 2.10.0 %define gdk_pixbuf_binary_version 2.10.0
Name: gdk-pixbuf Name: gdk-pixbuf
Version: 2.36.9 Version: 2.36.9
Release: 0 Release: 0
@ -32,16 +31,20 @@ Source2: README.SUSE
Source99: baselibs.conf 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 # 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 Patch0: u_contrib-gdk-pixbuf-xlib-Fix-rgb888amsb.patch
BuildRequires: libjasper-devel BuildRequires: docbook-xsl-stylesheets
BuildRequires: gtk-doc
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
%if !0%{?is_opensuse} BuildRequires: meson
BuildRequires: translation-update-upstream BuildRequires: pkgconfig
%endif BuildRequires: xsltproc
BuildRequires: pkgconfig(glib-2.0) >= 2.48.0 BuildRequires: pkgconfig(glib-2.0) >= 2.48.0
BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
%description %description
gdk-pixbuf is an image loading library that can be extended by loadable gdk-pixbuf is an image loading library that can be extended by loadable
@ -52,10 +55,10 @@ Clutter.
Summary: An image loading library Summary: An image loading library
# Provide %%{name} to make the lang package installable # Provide %%{name} to make the lang package installable
Group: System/Libraries Group: System/Libraries
Provides: %{name} = %{version}
Requires(post): gdk-pixbuf-query-loaders Requires(post): gdk-pixbuf-query-loaders
Recommends: %{name}-lang = %{version} Recommends: %{name}-lang = %{version}
Conflicts: gtk2 < 2.21.3 Conflicts: gtk2 < 2.21.3
Provides: %{name} = %{version}
%description -n libgdk_pixbuf-2_0-0 %description -n libgdk_pixbuf-2_0-0
gdk-pixbuf is an image loading library that can be extended by loadable 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. This package contains development files for gdk-pixbuf.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%if !0%{?is_opensuse} %if !0%{?is_opensuse}
@ -118,20 +122,16 @@ translation-update-upstream
%endif %endif
%patch0 -p1 %patch0 -p1
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
cp -a %{S:2} . cp -a %{SOURCE2} .
%endif %endif
%build %build
%configure \ %meson -D with_docs=true
--disable-static \ %meson_build
--enable-introspection \
--with-libjasper \
--with-x11
%{__make} %{?_smp_mflags}
%install %install
%makeinstall %meson_install
find %{buildroot}%{_libdir} -name '*.la' -delete -print rm -rf %{buildroot}{%{_libexecdir},%{_datadir}}/installed-tests/
%find_lang %{name} %find_lang %{name}
touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders.cache
%if "%_lib" == "lib64" %if "%_lib" == "lib64"
@ -140,7 +140,7 @@ touch %{buildroot}%{_libdir}/gdk-pixbuf-2.0/%{gdk_pixbuf_binary_version}/loaders
%endif %endif
# Install rpm macros # Install rpm macros
mkdir -p %{buildroot}%{_sysconfdir}/rpm 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 # Note: when updating scriptlets, don't forget to also update baselibs.conf