From 0ff934f59e4688085986071e66f209c048f4175f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Jul 2022 12:58:15 -0400 Subject: [PATCH] https://github.com/coreos/rpm-ostree/releases/tag/v2022.12 Resolves: rhbz#2105405 --- .gitignore | 1 + ...build-Drop-dependency-on-rpm-to-4.16.patch | 26 ------------------- rpm-ostree.spec | 6 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 0001-build-Drop-dependency-on-rpm-to-4.16.patch diff --git a/.gitignore b/.gitignore index 03a8569..1320c6f 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ /rpm-ostree-2022.7.tar.xz /rpm-ostree-2022.8.tar.xz /rpm-ostree-2022.11.tar.xz +/rpm-ostree-2022.12.tar.xz diff --git a/0001-build-Drop-dependency-on-rpm-to-4.16.patch b/0001-build-Drop-dependency-on-rpm-to-4.16.patch deleted file mode 100644 index 4c4b66a..0000000 --- a/0001-build-Drop-dependency-on-rpm-to-4.16.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c7597899b2718557be30da1b26f3fb1028cbb3aa Mon Sep 17 00:00:00 2001 -From: Colin Walters -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 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index bb8fae1..07f7c2b 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,14 +3,13 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.11 +Version: 2022.12 Release: 2%{?dist} License: LGPLv2+ URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" # 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 -Patch0: 0001-build-Drop-dependency-on-rpm-to-4.16.patch ExclusiveArch: %{rust_arches} @@ -247,6 +246,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Tue Jul 19 2022 Colin Walters - 2022.12-2 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.12 + * Mon Jul 11 2022 Colin Walters - 2022.11-2 - https://github.com/coreos/rpm-ostree/releases/tag/v2022.11 Resolves: rhbz#2105405 diff --git a/sources b/sources index f4b6e7f..f9294f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2022.11.tar.xz) = 6bc12eab5205dc989ce29dfaa3744bc2beaa5490bae64a6834fcb1bd57f47b1e5a3dd93024e9601c748683762b776238a70707cdb78bf59f3a1e3bd09bbb2dc8 +SHA512 (rpm-ostree-2022.12.tar.xz) = e1a507955605f4e9519e7825e857454cead20a033e6f3068926c04d4149950f8a877757a983e4f54bedd1b011099a8024cb7c931ecda5b0a0a4f4e7a0f7dca9d