Compare commits
No commits in common. "c8s-rebase-0.3.28" and "c8" have entirely different histories.
c8s-rebase
...
c8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
|||||||
SOURCES/libxmlb-0.1.15.tar.xz
|
SOURCES/libxmlb-0.1.15.tar.xz
|
||||||
/libxmlb-0.1.15.tar.xz
|
|
||||||
/libxmlb-0.3.28.tar.xz
|
|
||||||
|
|||||||
1
.libxmlb.metadata
Normal file
1
.libxmlb.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
e5ee3779a5025d2130859015b12eead2b407a9e3 SOURCES/libxmlb-0.1.15.tar.xz
|
||||||
@ -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
|
|
||||||
|
|
||||||
@ -2,20 +2,17 @@
|
|||||||
|
|
||||||
Summary: Library for querying compressed XML metadata
|
Summary: Library for querying compressed XML metadata
|
||||||
Name: libxmlb
|
Name: libxmlb
|
||||||
Version: 0.3.28
|
Version: 0.1.15
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://github.com/hughsie/%{name}
|
URL: https://github.com/hughsie/libxmlb
|
||||||
Source0: https://github.com/hughsie/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
|
Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz
|
||||||
Patch0: 0001-Revert-the-soname-for-RHEL-8.patch
|
|
||||||
|
|
||||||
BuildRequires: glib2-devel >= %{glib2_version}
|
BuildRequires: glib2-devel >= %{glib2_version}
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
BuildRequires: libstemmer-devel
|
BuildRequires: libstemmer-devel
|
||||||
BuildRequires: meson
|
BuildRequires: meson
|
||||||
BuildRequires: gobject-introspection-devel
|
BuildRequires: gobject-introspection-devel
|
||||||
BuildRequires: xz-devel
|
|
||||||
BuildRequires: libzstd-devel
|
|
||||||
BuildRequires: python3-setuptools
|
BuildRequires: python3-setuptools
|
||||||
|
|
||||||
# needed for the self tests
|
# needed for the self tests
|
||||||
@ -43,13 +40,12 @@ Files for development with %{name}.
|
|||||||
|
|
||||||
%package tests
|
%package tests
|
||||||
Summary: Files for installed tests
|
Summary: Files for installed tests
|
||||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
|
||||||
|
|
||||||
%description tests
|
%description tests
|
||||||
Executable and data files for installed tests.
|
Executable and data files for installed tests.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%setup -q
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
@ -68,8 +64,7 @@ Executable and data files for installed tests.
|
|||||||
%files
|
%files
|
||||||
%doc README.md
|
%doc README.md
|
||||||
%license LICENSE
|
%license LICENSE
|
||||||
%{_bindir}/xb-tool
|
%{_libexecdir}/xb-tool
|
||||||
%{_mandir}/man1/xb-tool.1*
|
|
||||||
%dir %{_libdir}/girepository-1.0
|
%dir %{_libdir}/girepository-1.0
|
||||||
%{_libdir}/girepository-1.0/*.typelib
|
%{_libdir}/girepository-1.0/*.typelib
|
||||||
%{_libdir}/libxmlb.so.1*
|
%{_libdir}/libxmlb.so.1*
|
||||||
@ -85,21 +80,11 @@ Executable and data files for installed tests.
|
|||||||
%{_libdir}/pkgconfig/xmlb.pc
|
%{_libdir}/pkgconfig/xmlb.pc
|
||||||
|
|
||||||
%files tests
|
%files tests
|
||||||
%dir %{_libexecdir}/installed-tests/libxmlb
|
|
||||||
%{_libexecdir}/installed-tests/libxmlb/xb-self-test
|
%{_libexecdir}/installed-tests/libxmlb/xb-self-test
|
||||||
%{_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
|
%{_datadir}/installed-tests/libxmlb/libxmlb.test
|
||||||
|
%{_datadir}/installed-tests/libxmlb/test.xml.gz.gz.gz
|
||||||
|
%dir %{_datadir}/installed-tests/libxmlb
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Jul 02 2026 Richard Hughes <rhughes@redhat.com> 0.3.28-1
|
|
||||||
- New upstream release for fwupd backport
|
|
||||||
- Resolves: RHEL-190658
|
|
||||||
|
|
||||||
* Wed Mar 11 2020 Richard Hughes <richard@hughsie.com> 0.1.15-1
|
* Wed Mar 11 2020 Richard Hughes <richard@hughsie.com> 0.1.15-1
|
||||||
- Initial release for RHEL
|
- Initial release for RHEL
|
||||||
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-8
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
||||||
Loading…
Reference in New Issue
Block a user