diff --git a/.gitignore b/.gitignore index 363fa37..3c05672 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ SOURCES/libxmlb-0.1.15.tar.xz /libxmlb-0.1.15.tar.xz +/libxmlb-0.3.28.tar.xz diff --git a/0001-Revert-the-soname-for-RHEL-8.patch b/0001-Revert-the-soname-for-RHEL-8.patch new file mode 100644 index 0000000..fc1b7bb --- /dev/null +++ b/0001-Revert-the-soname-for-RHEL-8.patch @@ -0,0 +1,61 @@ +From 5bff57760c64fe4eec55369d310de1ac6c9c4025 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Fri, 29 May 2026 11:15:43 +0100 +Subject: [PATCH] Revert the soname for RHEL-8 + +This was bumped in 52f64aa8bbf785244a7f3a2b3881e265c01eff82 just in case that +any external programs were using removed internal (but exported) symbols. + +Nothing in RHEL-8 actually uses these, so it is safe to use the old soname. +--- + meson.build | 2 +- + src/meson.build | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/meson.build b/meson.build +index 751e9e0..48c6445 100644 +--- a/meson.build ++++ b/meson.build +@@ -18,7 +18,7 @@ conf.set('XMLB_MICRO_VERSION', libxmlb_micro_version) + conf.set_quoted('PACKAGE_VERSION', libxmlb_version) + + # libtool versioning - this applies to libxmlb +-lt_current = '2' ++lt_current = '1' + lt_revision = '0' + lt_age = '0' + lt_version = '@0@.@1@.@2@'.format(lt_current, lt_age, lt_revision) +diff --git a/src/meson.build b/src/meson.build +index 3dc6b4e..89330be 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -6,7 +6,7 @@ libxmlb_version_h = configure_file( + + install_headers( + 'xmlb.h', +- subdir : 'libxmlb-2', ++ subdir : 'libxmlb-@0@'.format(lt_current), + ) + + xb_headers = files( +@@ -34,7 +34,7 @@ xb_headers = files( + + install_headers( + xb_headers, +- subdir : 'libxmlb-2/libxmlb', ++ subdir : 'libxmlb-@0@/libxmlb'.format(lt_current), + ) + + subdir('libxmlb') +@@ -139,7 +139,7 @@ endif + pkgg = import('pkgconfig') + pkgg.generate(libxmlb, + requires : [ 'gio-2.0' ], +- subdirs : 'libxmlb-2', ++ subdirs : 'libxmlb-@0@'.format(lt_current), + version : meson.project_version(), + name : 'libxmlb', + filebase : 'xmlb', +-- +2.54.0 + diff --git a/libxmlb.spec b/libxmlb.spec index ae69195..a575f04 100644 --- a/libxmlb.spec +++ b/libxmlb.spec @@ -2,17 +2,20 @@ Summary: Library for querying compressed XML metadata Name: libxmlb -Version: 0.1.15 +Version: 0.3.28 Release: 1%{?dist} License: LGPLv2+ -URL: https://github.com/hughsie/libxmlb -Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz +URL: https://github.com/hughsie/%{name} +Source0: https://github.com/hughsie/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz +Patch0: 0001-Revert-the-soname-for-RHEL-8.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk-doc BuildRequires: libstemmer-devel BuildRequires: meson BuildRequires: gobject-introspection-devel +BuildRequires: xz-devel +BuildRequires: libzstd-devel BuildRequires: python3-setuptools # needed for the self tests @@ -40,12 +43,13 @@ Files for development with %{name}. %package tests Summary: Files for installed tests +Requires: %{name}%{?_isa} = %{version}-%{release} %description tests Executable and data files for installed tests. %prep -%setup -q +%autosetup -p1 %build @@ -64,7 +68,8 @@ Executable and data files for installed tests. %files %doc README.md %license LICENSE -%{_libexecdir}/xb-tool +%{_bindir}/xb-tool +%{_mandir}/man1/xb-tool.1* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/*.typelib %{_libdir}/libxmlb.so.1* @@ -80,11 +85,21 @@ Executable and data files for installed tests. %{_libdir}/pkgconfig/xmlb.pc %files tests +%dir %{_libexecdir}/installed-tests/libxmlb %{_libexecdir}/installed-tests/libxmlb/xb-self-test -%{_datadir}/installed-tests/libxmlb/libxmlb.test -%{_datadir}/installed-tests/libxmlb/test.xml.gz.gz.gz +%{_libexecdir}/installed-tests/libxmlb/test.desktop +%{_libexecdir}/installed-tests/libxmlb/test.quirk +%{_libexecdir}/installed-tests/libxmlb/test.xml +%{_libexecdir}/installed-tests/libxmlb/test.xml.xz +%{_libexecdir}/installed-tests/libxmlb/test.xml.zst +%{_libexecdir}/installed-tests/libxmlb/test.xml.gz.gz.gz %dir %{_datadir}/installed-tests/libxmlb +%{_datadir}/installed-tests/libxmlb/libxmlb.test %changelog +* Thu Jul 02 2026 Richard Hughes 0.3.28-1 +- New upstream release for fwupd backport +- Resolves: RHEL-190658 + * Wed Mar 11 2020 Richard Hughes 0.1.15-1 - Initial release for RHEL diff --git a/sources b/sources index b887418..c651b09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libxmlb-0.1.15.tar.xz) = 9e1473adc2f86018cad1685fc06dcfdd2fc9a54ea95e30aab10ee63baa258524becc7f4f5ee2d165a09bf6188e0a6b330476816acabab45d4e89dafe992bcbd4 +SHA512 (libxmlb-0.3.28.tar.xz) = ff32f82e82425af20bd27a16e3f022dd43503f11843579a0f80699d0a54a3bbb057a35096939d83d134a88834763a48907cc3efba7fec3ec43a8e81e972aad68