From 36af9d28bc2298ec68c28a655e5f0afa2df74ef1 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 10 Aug 2023 19:12:25 +0100 Subject: [PATCH] New upstream release --- .gitignore | 1 + 0001-meson-fix-prefix-for-windows-build.patch | 37 ------------------- libxmlb.spec | 5 +-- sources | 2 +- 4 files changed, 4 insertions(+), 41 deletions(-) delete mode 100644 0001-meson-fix-prefix-for-windows-build.patch diff --git a/.gitignore b/.gitignore index c2fd0d8..f5ecbca 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /libxmlb-0.3.9.tar.xz /libxmlb-0.3.10.tar.xz /libxmlb-0.3.11.tar.xz +/libxmlb-0.3.12.tar.xz diff --git a/0001-meson-fix-prefix-for-windows-build.patch b/0001-meson-fix-prefix-for-windows-build.patch deleted file mode 100644 index 60b0982..0000000 --- a/0001-meson-fix-prefix-for-windows-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From da11d2e2deca9f21973bfd118c33df8b7e97b082 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Wed, 26 Jul 2023 15:45:54 +0400 -Subject: [PATCH] meson: fix prefix for windows build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -See also: -https://github.com/hughsie/libxmlb/pull/136 - -Signed-off-by: Marc-André Lureau ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 7c27a4b..a4d89c2 100644 ---- a/meson.build -+++ b/meson.build -@@ -102,12 +102,12 @@ add_project_link_arguments( - language: 'c' - ) - -+prefix = get_option('prefix') - if host_machine.system() == 'windows' - bindir = get_option('bindir') - installed_test_bindir = get_option('libexecdir') - installed_test_datadir = get_option('datadir') - else -- prefix = get_option('prefix') - datadir = join_paths(prefix, get_option('datadir')) - bindir = join_paths(prefix, get_option('bindir')) - libexecdir = join_paths(prefix, get_option('libexecdir')) --- -2.41.0 - diff --git a/libxmlb.spec b/libxmlb.spec index 59474dc..d14d7f1 100644 --- a/libxmlb.spec +++ b/libxmlb.spec @@ -8,12 +8,11 @@ Summary: Library for querying compressed XML metadata Name: libxmlb -Version: 0.3.11 +Version: 0.3.12 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 -Patch0001: 0001-meson-fix-prefix-for-windows-build.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gtk-doc @@ -136,7 +135,7 @@ rm -f $RPM_BUILD_ROOT/%{mingw64_mandir}/man1/xb-tool.1* %files tests %dir %{_libexecdir}/installed-tests/libxmlb %{_libexecdir}/installed-tests/libxmlb/xb-self-test -%{_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 diff --git a/sources b/sources index cc84e95..ebfa222 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libxmlb-0.3.11.tar.xz) = 26537c763f082d482f29355b86b9875b3db75283adbade2c7c07dd1ab1e60dfd231590c98a5f8fdd9a308a39f87021d1c3e87cb5b52ffec387700cff977715ea +SHA512 (libxmlb-0.3.12.tar.xz) = fac9ef3f06df9ca95f197b4b3aadb6f7ab56dd1c9ff16ceec05bbd95921bd9dbf7f16babc84bf48c7ae9ba680a5946b9e555b827ea75514bdfeb50cfcbc328e9