Resolves: rhbz#2105405
This commit is contained in:
Colin Walters 2022-07-19 12:58:15 -04:00
parent 97e4c30e6f
commit 0ff934f59e
4 changed files with 6 additions and 29 deletions

1
.gitignore vendored
View File

@ -107,3 +107,4 @@
/rpm-ostree-2022.7.tar.xz /rpm-ostree-2022.7.tar.xz
/rpm-ostree-2022.8.tar.xz /rpm-ostree-2022.8.tar.xz
/rpm-ostree-2022.11.tar.xz /rpm-ostree-2022.11.tar.xz
/rpm-ostree-2022.12.tar.xz

View File

@ -1,26 +0,0 @@
From c7597899b2718557be30da1b26f3fb1028cbb3aa Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 12 Jul 2022 15:12:05 -0400
Subject: [PATCH] build: Drop dependency on rpm to 4.16
This is what's in RHEL9 right now.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index ecdd2c6e..a560446c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,7 +81,7 @@ PKG_PROG_PKG_CONFIG
dnl Remember to update AM_CPPFLAGS in Makefile.am when bumping GIO req.
PKG_CHECK_MODULES(PKGDEP_GIO_UNIX, [gio-unix-2.0])
dnl These are the dependencies of the public librpmostree-1.0.0 shared library
-PKG_CHECK_MODULES(PKGDEP_LIBRPMOSTREE, [gio-unix-2.0 >= 2.50.0 json-glib-1.0 ostree-1 >= 2021.2 rpm >= 4.17])
+PKG_CHECK_MODULES(PKGDEP_LIBRPMOSTREE, [gio-unix-2.0 >= 2.50.0 json-glib-1.0 ostree-1 >= 2021.2 rpm >= 4.16])
dnl And these additional ones are used by for the rpmostreeinternals C/C++ library
PKG_CHECK_MODULES(PKGDEP_RPMOSTREE, [polkit-gobject-1 libarchive])
--
2.36.1

View File

@ -3,14 +3,13 @@
Summary: Hybrid image/package system Summary: Hybrid image/package system
Name: rpm-ostree Name: rpm-ostree
Version: 2022.11 Version: 2022.12
Release: 2%{?dist} Release: 2%{?dist}
License: LGPLv2+ License: LGPLv2+
URL: https://github.com/coreos/rpm-ostree URL: https://github.com/coreos/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
# in the upstream git. It also contains vendored Rust sources. # in the upstream git. It also contains vendored Rust sources.
Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
Patch0: 0001-build-Drop-dependency-on-rpm-to-4.16.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
@ -247,6 +246,9 @@ $PYTHON autofiles.py > files.devel \
%files devel -f files.devel %files devel -f files.devel
%changelog %changelog
* Tue Jul 19 2022 Colin Walters <walters@verbum.org> - 2022.12-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12
* Mon Jul 11 2022 Colin Walters <walters@verbum.org> - 2022.11-2 * Mon Jul 11 2022 Colin Walters <walters@verbum.org> - 2022.11-2
- https://github.com/coreos/rpm-ostree/releases/tag/v2022.11 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.11
Resolves: rhbz#2105405 Resolves: rhbz#2105405

View File

@ -1 +1 @@
SHA512 (rpm-ostree-2022.11.tar.xz) = 6bc12eab5205dc989ce29dfaa3744bc2beaa5490bae64a6834fcb1bd57f47b1e5a3dd93024e9601c748683762b776238a70707cdb78bf59f3a1e3bd09bbb2dc8 SHA512 (rpm-ostree-2022.12.tar.xz) = e1a507955605f4e9519e7825e857454cead20a033e6f3068926c04d4149950f8a877757a983e4f54bedd1b011099a8024cb7c931ecda5b0a0a4f4e7a0f7dca9d