Accepting request 523361 from GNOME:Factory

New upstream release (forwarded request 523315 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/523361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdk-pixbuf?expand=0&rev=65

gdk-pixbuf-2.36.10.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8f6fa896b89475c73b6e9e8d2a2b062fc359c4b4ccb8e96470d6ab5da949ace
+size 5772196

gdk-pixbuf-2.36.9.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8013b271ff1a691514b5bbc9b99f6ed456422d4da4a721a9db0b783abe8e740a
-size 5769124

gdk-pixbuf.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Sep 11 15:55:29 UTC 2017 - zaitor@opensuse.org
+
+- Update to version 2.36.10:
+  + build: meson build improvements.
+  + build: win32 build fixes.
+  + tests: show error before failing (bgo#786259).
+  + Updated translations.
+
+-------------------------------------------------------------------
+Fri Sep  8 22:35:48 UTC 2017 - jengelh@inai.de
+
+- Update summaries and RPM categories.
+
+-------------------------------------------------------------------
+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
 

gdk-pixbuf.spec

@@ -18,13 +18,12 @@
 
 # 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
+Version:        2.36.10
 Release:        0
 Summary:        An image loading library
 License:        LGPL-2.1+
-Group:          System/Libraries
+Group:          Development/Libraries/GNOME
 Url:            http://www.gnome.org/
 Source:         https://download.gnome.org/sources/gdk-pixbuf/2.36/%{name}-%{version}.tar.xz
 Source1:        macros.gdk-pixbuf
@@ -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:  meson
-BuildRequires:  translation-update-upstream
+BuildRequires:  pkgconfig
-%endif
+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
@@ -63,7 +66,7 @@ modules for new image formats. It is used by toolkits such as GTK+ or
 Clutter.
 
 %package -n typelib-1_0-GdkPixbuf-2_0
-Summary:        An image loading library -- Introspection bindings
+Summary:        Introspection bindins for gdk-pixbuf
 Group:          System/Libraries
 
 %description -n typelib-1_0-GdkPixbuf-2_0
@@ -74,8 +77,8 @@ Clutter.
 This package provides the GObject Introspection bindings for gdk-pixbuf.
 
 %package query-loaders
-Summary:        An image loading library - Utility to create loaders cache
+Summary:        Utility to create a cache of gdk-pixbuf loaders
-Group:          System/Libraries
+Group:          System/X11/Utilities
 
 %description query-loaders
 gdk-pixbuf is an image loading library that can be extended by loadable
@@ -87,7 +90,7 @@ loadable modules.
 
 %package thumbnailer
 Summary:        System helper creating thumbnails
-Group:          System/Libraries
+Group:          System/X11/Utilities
 Supplements:    libgdk_pixbuf-2_0-0
 
 %description thumbnailer
@@ -98,7 +101,7 @@ Clutter.
 This package contains the thumbnailer utility.
 
 %package devel
-Summary:        An image loading library - Development Files
+Summary:        Development files for gdk-pixbuf, an image loading library
 Group:          Development/Languages/C and C++
 Requires:       libgdk_pixbuf-2_0-0 = %{version}
 Requires:       typelib-1_0-GdkPixbuf-2_0 = %{version}
@@ -108,9 +111,10 @@ gdk-pixbuf is an image loading library that can be extended by loadable
 modules for new image formats. It is used by toolkits such as GTK+ or
 Clutter.
 
-This package contains development files for gdk-pixbuf.
+This package contains the 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 \
+%meson -D with_docs=true
-        --disable-static \
+%meson_build
-        --enable-introspection \
-        --with-libjasper \
-        --with-x11
-%{__make} %{?_smp_mflags}
 
 %install
-%makeinstall
+%meson_install
-find %{buildroot}%{_libdir} -name '*.la' -delete -print
+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