!10 [sync] PR-9: update to gdk-pixbuf-2.42.6

Merge pull request !10 from openeuler-sync-bot/sync-pr9-openEuler-22.03-LTS-Next-to-master

gdk-pixbuf2.spec

@@ -1,35 +1,57 @@
+%global glib2_version 2.56.0
+
 Name:           gdk-pixbuf2
-Version:        2.40.0
-Release:        2
+Version:        2.42.6
+Release:        1
 Summary:        gdk is a multi-platform toolkit for creating graphical user interfaces.
-
 License:        LGPLv2+
-URL:            http://www.gtk.org
-Source0:        http://download.gnome.org/sources/gdk-pixbuf/2.40/gdk-pixbuf-%{version}.tar.xz
+URL:            https://gitlab.gnome.org/GNOME/gdk-pixbuf
+Source0:        https://download-fallback.gnome.org/sources/gdk-pixbuf/2.42/gdk-pixbuf-%{version}.tar.xz
 
-BuildRequires:  gettext gtk-doc pkgconfig(gio-2.0) >= 2.48.0 libpng-devel libjpeg-devel libtiff-devel shared-mime-info
-BuildRequires:  meson pkgconfig(x11) pkgconfig(gobject-introspection-1.0) >= 0.9.3 gobject-introspection-devel libxslt 
+BuildRequires:  docbook-style-xsl
+BuildRequires:  gettext
+BuildRequires:  pkgconfig(gio-2.0) >= %{glib2_version}
+BuildRequires:  libpng-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libtiff-devel
+BuildRequires:  libxslt
+BuildRequires:  meson
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  shared-mime-info
 
-Requires:       glib2 >= 2.48.0 shared-mime-info
-
-Provides:       %{name}-modules %{name}-xlib
-Obsoletes:      %{name}-modules %{name}-xlib
+Requires: glib2%{?_isa} >= %{glib2_version}
+Requires: shared-mime-info
 
 %description
 gdk is written in C but has been designed from the ground up to support a wide range of languages.
 It provide a complete set of widgets,and suitable for projects ranging from small one-off
 tools to complete application suites.
 
-%package        devel
-Summary:        Development files for gdk-pixbuf , gdk-pixbuf-xlib,Tests for the gdk-pixbuf2 package
-Requires:       %{name} = %{version}-%{release} glib2-devel >= 2.48.0
-Provides:       %{name}-xlib-devel %{name}-tests
-Obsoletes:      %{name}-xlib-devel %{name}-tests
+%package modules
+Summary: Additional image modules for gdk-pixbuf2
+Requires: %{name}%{?_isa} = %{version}-%{release}
 
-%description    devel
+%description modules
+This package contains the additional modules that are needed to load various
+image formats such as ICO and JPEG.
+
+%package devel
+Summary: Development files for gdk-pixbuf2
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: glib2-devel%{?_isa} >= %{glib2_version}
+
+%description devel
 This package contains libraries and header files needed for doing development and
 speeding up your development time
 
+%package tests
+Summary: Tests for the %{name} package
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description tests
+The %{name}-tests package contains tests that can be used to verify
+the functionality of the installed %{name} package.
+
 %package help
 Summary:        Development Documentation files for gdk-pixbuf2 and xlib library
 Buildarch: noarch
@@ -39,12 +61,14 @@ Requires:       %{name} = %{version}-%{release}
 The gdk-pixbuf2 package contains the documentation files which is useful for
 developing applications that uses gdk-pixbuf2 xlib and test.
 
-
 %prep
 %autosetup -n gdk-pixbuf-%{version} -p1
 
 %build
-%meson -Dbuiltin_loaders=png -Ddocs=true 
+%meson \
+       -Dgtk_doc=false \
+       -Dman=true \
+       %{nil}
 
 %global _smp_mflags -j1
 %meson_build
@@ -53,7 +77,10 @@ developing applications that uses gdk-pixbuf2 xlib and test.
 %meson_install
 
 touch $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
-(cd $RPM_BUILD_ROOT%{_bindir}; mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-%{__isa_bits})
+
+(cd $RPM_BUILD_ROOT%{_bindir}
+ mv gdk-pixbuf-query-loaders gdk-pixbuf-query-loaders-%{__isa_bits}
+)
 
 %find_lang gdk-pixbuf
 
@@ -64,30 +91,33 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache
 gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache
 
 %files -f gdk-pixbuf.lang
-%defattr(-,root,root)
-%doc NEWS
 %license COPYING
-%{_libdir}/libgdk_pixbuf*.so.*
+%doc NEWS
+%{_libdir}/libgdk_pixbuf-2.0.so.*
 %{_libdir}/girepository-1.0
-%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+%dir %{_libdir}/gdk-pixbuf-2.0
+%dir %{_libdir}/gdk-pixbuf-2.0/2.10.0
+%dir %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders
 %ghost %{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders.cache
 %{_bindir}/gdk-pixbuf-query-loaders-%{__isa_bits}
 %{_bindir}/gdk-pixbuf-thumbnailer
 %{_datadir}/thumbnailers/
 
+%files modules
+%{_libdir}/gdk-pixbuf-2.0/2.10.0/loaders/*.so
+
 %files devel
-%defattr(-,root,root)
+%dir %{_includedir}/gdk-pixbuf-2.0
 %{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf
-%{_includedir}/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-%{_libdir}/libgdk_pixbuf*.so
-%{_libdir}/pkgconfig/gdk-pixbuf-*.pc
+%{_libdir}/libgdk_pixbuf-2.0.so
+%{_libdir}/pkgconfig/gdk-pixbuf-2.0.pc
 %{_bindir}/gdk-pixbuf-csource
 %{_bindir}/gdk-pixbuf-pixdata
-%{_libexecdir}/installed-tests
-%{_datadir}/gir-1.0
-%{_datadir}/gtk-doc/html/*
-%{_datadir}/installed-tests
+%{_datadir}/gir-1.0/
 
+%files tests
+%{_libexecdir}/installed-tests
+%{_datadir}/installed-tests
 
 %files help
 %defattr(-,root,root)
@@ -95,6 +125,9 @@ gdk-pixbuf-query-loaders-%{__isa_bits} --update-cache
 %{_mandir}/man1/gdk-pixbuf-csource.1*
 
 %changelog
+* Thu Dec 2 2021 hanhui <hanhui15@huawei.com> - 2.42.6-1
+- update to 2.42.6
+
 * Thu Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 2.40.0-2
 - delete gdb in buildrequires