Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

4 changed files with 193 additions and 78 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libxmlb-0.3.28.tar.xz
SOURCES/libxmlb-0.3.24.tar.xz

View File

@ -1 +1 @@
64d28b04f36f846c2146b5c29ed37c6efcebc562 SOURCES/libxmlb-0.3.28.tar.xz
e8bd5c5c3029ce97b1089f47ae31e09a26a9cd82 SOURCES/libxmlb-0.3.24.tar.xz

View File

@ -1,61 +0,0 @@
From 5bff57760c64fe4eec55369d310de1ac6c9c4025 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
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

View File

@ -2,12 +2,11 @@
Summary: Library for querying compressed XML metadata
Name: libxmlb
Version: 0.3.28
Version: 0.3.24
Release: 1%{?dist}
License: LGPLv2+
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
URL: https://github.com/hughsie/libxmlb
Source0: https://github.com/hughsie/libxmlb/releases/download/%{version}/%{name}-%{version}.tar.xz
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk-doc
@ -43,13 +42,12 @@ 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
%autosetup -p1
%setup -q
%build
@ -71,16 +69,16 @@ Executable and data files for installed tests.
%{_bindir}/xb-tool
%{_mandir}/man1/xb-tool.1*
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/*.typelib
%{_libdir}/libxmlb.so.1*
%{_libdir}/girepository-1.0/Xmlb-2.0.typelib
%{_libdir}/libxmlb.so.2*
%files devel
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/*.gir
%{_datadir}/gir-1.0/Xmlb-2.0.gir
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/libxmlb
%{_includedir}/libxmlb-1
%{_includedir}/libxmlb-2
%{_libdir}/libxmlb.so
%{_libdir}/pkgconfig/xmlb.pc
@ -97,9 +95,187 @@ Executable and data files for installed tests.
%{_datadir}/installed-tests/libxmlb/libxmlb.test
%changelog
* Thu Jul 02 2026 Richard Hughes <rhughes@redhat.com> 0.3.28-1
- New upstream release for fwupd backport
- Resolves: RHEL-190658
* Fri Sep 26 2025 RHEL Packaging Agent <jotnar@redhat.com> - 0.3.24-1
- Rebase to 0.3.24
- Add missing libzstd-devel BuildRequires
- Add missing files to the %files tests section
- Resolves: RHEL-116442
* Wed Mar 11 2020 Richard Hughes <richard@hughsie.com> 0.1.15-1
- Initial release for RHEL
* Fri Oct 14 2022 Neal Gompa <ngompa@centosproject.org> - 0.3.10-1
- New upstream release
- Fix dumping and exporting multiple files from the CLI
- Watch files before loading them into the builder
- Fix potential double free when filtering by language
- Fix the crash for when the root tree has no children
- Fix the crash when getting the element for the [empty] root
- Install xb-tool into bindir
- Ensure reproducible results when importing a node
- Ignore all hidden files when using _WATCH_DIRECTORY
- Show the value bindings when using XB_SILO_PROFILE_FLAG_XPATH
- Ensure _IS_TOKENIZED is set if tokens are added manually
- Ensure we never add too many tokens to the silo
- Put tail after the node when exporting XbBuilderNode
- Remove the G_ALIGNOF checks to fix compile with old GLib versions
- Add a flag to require the XbBuilderSource to have no siblings
- Add iterator for XbNode attributes and children
- Allow removing XbBuilderNode text
- Allow stripping builder node inner text
- Resolves: rhbz#2134794
* Wed Oct 06 2021 Richard Hughes <richard@hughsie.com> 0.3.3-1
- New upstream release
- Add locking for file monitors
- Add support for LZMA decompression
- Clarify GMainContext usage and signal emission
- Respect XB_BUILDER_NODE_FLAG_IGNORE when exporting
- Use the chosen chunk size when reading from a stream
- Use the correct pkgconfig export package name in the GIR file
- Always run xb-tool queries with the optimizer
- Ensure tokens handling works when XbOpcode is not zero-inited
- Use stack-allocated XbStack instances for running a machine
- Resolves: rhbz#1965891
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.0-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Fri Mar 12 2021 Richard Hughes <richard@hughsie.com> 0.3.0-1
- New upstream release
- Add a new object to contain query context data
- Allow collapsing empty XML tags if no children or text
- Allow marking elements as tokenized from xb-tool
- Allow optimized searching when comparing tokens
- Cancel the GFileMonitor before unreffing it
- Do not allocate a 128Mb buffer for each xb_builder_source_ctx_get_bytes()
- Do not error when creating a query if the element doesnt exist
- Fix a parse failure for a double comment
- Fix various errors or missing annotations in docs
- Make handling of single-result queries more robust
- Support mmap()ing the source file to get bytes
- Support query caching with xb_silo_lookup_query()
- Support UTF-8 for upper-case() and lower-case()
- Use g_str_match_string() for non-ASCII search queries
- Write search tokens into the built silo
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Sep 07 2020 Richard Hughes <richard@hughsie.com> 0.2.1-1
- New upstream release
- Do not assume g_content_type_guess() always returns valid results
- Fix getting translated results in gnome-software
- Update the header location to reflect the new API
* Tue Aug 18 2020 Richard Hughes <richard@hughsie.com> 0.2.0-1
- New upstream release which breaks API and ABI
- Add the missing TEXT:INTE XPath support
- Add variant of xb_silo_query_with_root() avoiding XbNode creation
- Add XB_BUILDER_SOURCE_FLAG_WATCH_DIRECTORY flag
- Allow specifying the node cache behaviour for the query
- Avoid recursion when setting flags if possible
- Avoid using weak pointers when building the silo
- Do not allocate opcodes individually
- Do not show a critical warning for invalid XML
- Do not unconditionally create GTimer objects
- Do not use the node cache when building indexes
- Lazy load more arrays to reduce RSS usage
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Mar 04 2020 Richard Hughes <richard@hughsie.com> 0.1.15-1
- New upstream release
- Add xb_builder_source_add_simple_adapter()
- Allow reversing the query results
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 06 2020 Richard Hughes <richard@hughsie.com> 0.1.14-1
- New upstream release
- Do not use libuuid
- Ignore adaptors added with xb_builder_source_add_converter()
* Thu Oct 17 2019 Richard Hughes <richard@hughsie.com> 0.1.13-1
- New upstream release
- Export xb_silo_query_full()
- Show the XPath that was used in the query in the error message
* Fri Sep 27 2019 Richard Hughes <richard@hughsie.com> 0.1.12-1
- New upstream release
- Add xb_node_transmogrify to allow changing XML format
- Do not escape a single quote with &apos;
- Don't invalidate the silo for a GIO temp file
- Fix up two memory leaks if using libxmlb from an introspected binding
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 15 2019 Richard Hughes <richard@hughsie.com> 0.1.11-1
- New upstream release
- Add xb_node_query_first_full() API
- Rebuild the XbMachine parser to support 'and' and 'or' predicates
* Thu May 16 2019 Richard Hughes <richard@hughsie.com> 0.1.10-1
- New upstream release
- Do not mistake gzipped files as being application/x-zerosize content type
- Fix running the installed tests with no checkout directory
* Tue May 07 2019 Richard Hughes <richard@hughsie.com> 0.1.9-1
- New upstream release
- Correctly implement building a silo with _SINGLE_LANG set
* Tue Apr 16 2019 Adam Williamson <awilliam@redhat.com> - 0.1.8-2
- Rebuild with Meson fix for #1699099
* Tue Mar 26 2019 Richard Hughes <richard@hughsie.com> 0.1.8-1
- New upstream release
- Add some installed tests
- Always add all children when importing parent-less XML data
* Fri Mar 08 2019 Richard Hughes <richard@hughsie.com> 0.1.7-1
- New upstream release
- Add XB_BUILDER_COMPILE_FLAG_IGNORE_GUID
- Allow nesting XbBuilderSource content type handlers
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Dec 30 2018 Richard Hughes <richard@hughsie.com> 0.1.6-1
- New upstream release
- Allow controlling how the XbQuery is parsed
* Wed Nov 21 2018 Richard Hughes <richard@hughsie.com> 0.1.5-1
- New upstream release
- Add xb_builder_node_export() for gnome-software
- Ignore calls to xb_silo_query_build_index() with no results
- Lazy load the stemmer when required
* Fri Nov 09 2018 Richard Hughes <richard@hughsie.com> 0.1.4-1
- New upstream release
- Add support for bound variables and indexed strings
- Optionally optimize predicates
- Use INTE:INTE for comparison where available
* Mon Oct 22 2018 Richard Hughes <richard@hughsie.com> 0.1.3-1
- New upstream release
- Add more API for fwupd and gnome-software
- Switch from GPtrArray to XbStack for performance reasons
* Tue Oct 16 2018 Richard Hughes <richard@hughsie.com> 0.1.2-1
- New upstream release
- Add more API for fwupd and gnome-software
- Fix a crash when using xb_builder_node_set_text() in a fixup
- Only run the XbBuilderSourceConverterFunc if the silo needs rebuilding
- Return an error when the XPath predicate has invalid syntax
* Thu Oct 11 2018 Richard Hughes <richard@hughsie.com> 0.1.1-1
- New upstream release
- Add support for more XPath funtions
- Add new API required for gnome-software and fwupd
* Thu Oct 04 2018 Richard Hughes <richard@hughsie.com> 0.1.0-1
- Initial release for Fedora package review