From 7ba61ddeb8758645a45ef415c0afd1bd7c378e5e Mon Sep 17 00:00:00 2001 From: Josef Ridky Date: Wed, 23 Apr 2025 08:50:14 +0200 Subject: [PATCH] Resolves: RHEL-88142 - rebase to the latest upstream version Signed-off-by: Josef Ridky --- .gitignore | 1 + babl.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6e27b7b..097933d 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ babl-0.1.2.tar.bz2 /babl-0.1.78.tar.xz /babl-0.1.82.tar.xz /babl-0.1.86.tar.xz +/babl-0.1.112.tar.xz diff --git a/babl.spec b/babl.spec index 9885228..9c1973b 100644 --- a/babl.spec +++ b/babl.spec @@ -18,8 +18,8 @@ Summary: A dynamic, any to any, pixel format conversion library Name: babl -Version: 0.1.86 -Release: 4%{?dist} +Version: 0.1.112 +Release: 1%{?dist} # Compute some version related macros # Ugly hack, you need to get your quoting backslashes/percent signs straight @@ -75,17 +75,16 @@ This package contains documentation needed for developing with %{name}. %autosetup -p1 %build -%meson +%meson \ + -Dgi-docgen=disabled %meson_build %install %meson_install mkdir -p "%{buildroot}/%{develdocdir}" -cp -pr docs/graphics docs/*.html docs/babl.css "%{buildroot}/%{develdocdir}" -rm -f "%{buildroot}/%{develdocdir}"/graphics/meson.build -rm -f "%{buildroot}/%{develdocdir}"/graphics/.gitignore - +cp -pr "%{_vpath_builddir}"/docs/* "%{buildroot}/%{develdocdir}" +rm -f "%{buildroot}/%{develdocdir}/index.html.tmp" %check # skip tests known to be problematic in a specific version @@ -108,6 +107,7 @@ popd %files %license docs/COPYING* %doc AUTHORS NEWS +%{_bindir}/babl %{_libdir}/libbabl-%{apiver}.so.0* %{_libdir}/babl-%{apiver}/ %dir %{_libdir}/girepository-1.0 @@ -116,7 +116,7 @@ popd %files devel %{_includedir}/babl-%{apiver}/ %{_libdir}/libbabl-%{apiver}.so -%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}-%{apiver}.pc %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/Babl-%{apiver}.gir %{_datadir}/vala/ @@ -125,6 +125,9 @@ popd %doc %{develdocdir} %changelog +* Wed Apr 23 2025 Josef Ridky - 0.1.112-1 +- rebase to the latest upstream (RHEL-88142) + * Wed Jul 20 2022 Josef Ridky - 0.1.86-4 - fix FTBFS by adding openssh-clients into BuildRequires (#2105618) diff --git a/sources b/sources index 28ac67e..a093d76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (babl-0.1.86.tar.xz) = aff3b0069f7cdb515e6ace880500f4b89521062f9030ef452f0555b3cd993fffdd5f700c403a7be8e6758957073e7623360fc6ac41d86d5d31551c0fd0ff6048 +SHA512 (babl-0.1.112.tar.xz) = 18aef6baffbe978a6cdb05cf62fb8f14a81ba48ccb7dfc29a5581c9d46d8e34e2a8601bcea40ac5700661fe16bbc1bf72684f9f17e5c825c8fd7fec27c2c872b