Compare commits
No commits in common. "c8" and "c10s-rebase" have entirely different histories.
c8
...
c10s-rebas
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
36
.gitignore
vendored
36
.gitignore
vendored
@ -1 +1,35 @@
|
||||
SOURCES/libxmlb-0.3.28.tar.xz
|
||||
/libxmlb-0.1.0.tar.xz
|
||||
/libxmlb-0.1.1.tar.xz
|
||||
/libxmlb-0.1.2.tar.xz
|
||||
/libxmlb-0.1.3.tar.xz
|
||||
/libxmlb-0.1.4.tar.xz
|
||||
/libxmlb-0.1.5.tar.xz
|
||||
/libxmlb-0.1.6.tar.xz
|
||||
/libxmlb-0.1.7.tar.xz
|
||||
/libxmlb-0.1.8.tar.xz
|
||||
/libxmlb-0.1.9.tar.xz
|
||||
/libxmlb-0.1.10.tar.xz
|
||||
/libxmlb-0.1.11.tar.xz
|
||||
/libxmlb-0.1.12.tar.xz
|
||||
/libxmlb-0.1.13.tar.xz
|
||||
/libxmlb-0.1.14.tar.xz
|
||||
/libxmlb-0.1.15.tar.xz
|
||||
/libxmlb-0.2.0.tar.xz
|
||||
/libxmlb-0.2.1.tar.xz
|
||||
/libxmlb-0.3.0.tar.xz
|
||||
/libxmlb-0.3.1.tar.xz
|
||||
/libxmlb-0.3.2.tar.xz
|
||||
/libxmlb-0.3.3.tar.xz
|
||||
/libxmlb-0.3.4.tar.xz
|
||||
/libxmlb-0.3.5.tar.xz
|
||||
/libxmlb-0.3.6.tar.xz
|
||||
/libxmlb-0.3.7.tar.xz
|
||||
/libxmlb-0.3.9.tar.xz
|
||||
/libxmlb-0.3.10.tar.xz
|
||||
/libxmlb-0.3.11.tar.xz
|
||||
/libxmlb-0.3.12.tar.xz
|
||||
/libxmlb-0.3.13.tar.xz
|
||||
/libxmlb-0.3.14.tar.xz
|
||||
/libxmlb-0.3.15.tar.xz
|
||||
/libxmlb-0.3.23.tar.xz
|
||||
/libxmlb-0.3.24.tar.xz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
64d28b04f36f846c2146b5c29ed37c6efcebc562 SOURCES/libxmlb-0.3.28.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
|
||||
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
@ -1,23 +1,45 @@
|
||||
%global with_mingw 0
|
||||
%bcond stemmer %{defined fedora}
|
||||
|
||||
%if 0%{?fedora}
|
||||
%global with_mingw 1
|
||||
%endif
|
||||
|
||||
%global glib2_version 2.45.8
|
||||
|
||||
Summary: Library for querying compressed XML metadata
|
||||
Name: libxmlb
|
||||
Version: 0.3.28
|
||||
Release: 1%{?dist}
|
||||
License: LGPLv2+
|
||||
Version: 0.3.24
|
||||
Release: %autorelease
|
||||
License: LGPL-2.1-or-later
|
||||
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
|
||||
%if %{with stemmer}
|
||||
BuildRequires: libstemmer-devel
|
||||
%endif
|
||||
BuildRequires: meson
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: python3-setuptools
|
||||
|
||||
%if %{with_mingw}
|
||||
BuildRequires: mingw32-filesystem >= 95
|
||||
BuildRequires: mingw32-gcc-c++
|
||||
BuildRequires: mingw32-glib2
|
||||
BuildRequires: mingw32-xz
|
||||
BuildRequires: mingw32-zstd
|
||||
|
||||
BuildRequires: mingw64-filesystem >= 95
|
||||
BuildRequires: mingw64-gcc-c++
|
||||
BuildRequires: mingw64-glib2
|
||||
BuildRequires: mingw64-xz
|
||||
BuildRequires: mingw64-zstd
|
||||
%endif
|
||||
|
||||
# needed for the self tests
|
||||
BuildRequires: shared-mime-info
|
||||
|
||||
@ -48,6 +70,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
%description tests
|
||||
Executable and data files for installed tests.
|
||||
|
||||
%if %{with_mingw}
|
||||
%package -n mingw32-libxmlb
|
||||
Summary: MinGW library for querying compressed XML metadata
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n mingw32-libxmlb
|
||||
MinGW32 libxmlb library.
|
||||
|
||||
%package -n mingw64-libxmlb
|
||||
Summary: MinGW library for querying compressed XML metadata
|
||||
BuildArch: noarch
|
||||
|
||||
%description -n mingw64-libxmlb
|
||||
MinGW64 libxmlb library.
|
||||
|
||||
%{?mingw_debug_package}
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
@ -59,47 +99,67 @@ Executable and data files for installed tests.
|
||||
|
||||
%meson_build
|
||||
|
||||
%if %{with_mingw}
|
||||
%mingw_meson -Dintrospection=false -Dtests=false -Dgtkdoc=false
|
||||
%mingw_ninja
|
||||
%endif
|
||||
|
||||
%check
|
||||
%meson_test
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%if %{with_mingw}
|
||||
%mingw_ninja_install
|
||||
%mingw_debug_install_post
|
||||
rm -f $RPM_BUILD_ROOT/%{mingw32_mandir}/man1/xb-tool.1*
|
||||
rm -f $RPM_BUILD_ROOT/%{mingw64_mandir}/man1/xb-tool.1*
|
||||
%endif
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_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
|
||||
|
||||
%files tests
|
||||
%dir %{_libexecdir}/installed-tests/libxmlb
|
||||
%{_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
|
||||
%{_libexecdir}/installed-tests/libxmlb/test.*
|
||||
%dir %{_datadir}/installed-tests/libxmlb
|
||||
%{_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
|
||||
%if %{with_mingw}
|
||||
%files -n mingw32-libxmlb
|
||||
%license LICENSE
|
||||
%{mingw32_bindir}/xb-tool.exe
|
||||
%{mingw32_bindir}/libxmlb-2.dll
|
||||
%{mingw32_libdir}/libxmlb.dll.a
|
||||
%{mingw32_includedir}/libxmlb-2
|
||||
%{mingw32_libdir}/pkgconfig/xmlb.pc
|
||||
|
||||
* Wed Mar 11 2020 Richard Hughes <richard@hughsie.com> 0.1.15-1
|
||||
- Initial release for RHEL
|
||||
%files -n mingw64-libxmlb
|
||||
%license LICENSE
|
||||
%{mingw64_bindir}/xb-tool.exe
|
||||
%{mingw64_bindir}/libxmlb-2.dll
|
||||
%{mingw64_libdir}/libxmlb.dll.a
|
||||
%{mingw64_includedir}/libxmlb-2
|
||||
%{mingw64_libdir}/pkgconfig/xmlb.pc
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
5
main.fmf
Normal file
5
main.fmf
Normal file
@ -0,0 +1,5 @@
|
||||
plan:
|
||||
import:
|
||||
url: https://gitlab.cee.redhat.com/desktopqe/libxmlb.git
|
||||
name: /plan/gate
|
||||
ref: rhel-10
|
||||
Loading…
Reference in New Issue
Block a user