diff --git a/.gitignore b/.gitignore index 18a1cee..c7dd671 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ /rpm-ostree-2022.10.tar.xz /rpm-ostree-2022.11.tar.xz /rpm-ostree-2022.12.tar.xz +/rpm-ostree-2022.13.tar.xz diff --git a/0001-scripts-Ignore-filesystem.posttrans.patch b/0001-scripts-Ignore-filesystem.posttrans.patch deleted file mode 100644 index b97d735..0000000 --- a/0001-scripts-Ignore-filesystem.posttrans.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 668cc225ad0440cee5bd65021d4fc3002c7329ce Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Fri, 5 Aug 2022 14:14:09 -0400 -Subject: [PATCH] scripts: Ignore filesystem.posttrans - -New in rawhide. - -The entire filesystem package is insane. Every hack in there would go -away if we just taught traditional yum/dnf to install it first, in -the same way we do in rpm-ostree. ---- - rust/src/scripts.rs | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/rust/src/scripts.rs b/rust/src/scripts.rs -index 1f59e390..078322ab 100644 ---- a/rust/src/scripts.rs -+++ b/rust/src/scripts.rs -@@ -32,6 +32,10 @@ static IGNORED_PKG_SCRIPTS: phf::Set<&'static str> = phf_set! { - // Looks like legacy... - "ca-certificates.prein", - "libgcc.post", -+ // The entire filesystem package is insane. Every hack in there would go -+ // away if we just taught traditional yum/dnf to install it first, in -+ // the same way we do in rpm-ostree. -+ "filesystem.posttrans", - "setup.post", - "pinentry.prein", - "fedora-release.posttrans", --- -2.35.1 - diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 2ec446a..8b90891 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,16 +3,14 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2022.12 -Release: 4%{?dist} +Version: 2022.13 +Release: 1%{?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-scripts-Ignore-filesystem.posttrans.patch - ExclusiveArch: %{rust_arches} BuildRequires: make @@ -44,7 +42,6 @@ BuildRequires: autoconf automake libtool git # For docs BuildRequires: chrpath BuildRequires: gtk-doc -BuildRequires: gnome-common BuildRequires: /usr/bin/g-ir-scanner # Core requirements # One way to check this: `objdump -p /path/to/rpm-ostree | grep LIBOSTREE` and pick the highest (though that might miss e.g. new struct members) @@ -237,6 +234,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Sat Aug 27 2022 Colin Walters - 2022.13-1 +- https://github.com/coreos/rpm-ostree/releases/tag/v2022.13 + * Sun Aug 07 2022 Colin Walters - 2022.12-4 - Cherry pick patch to work around filesystem package diff --git a/sources b/sources index f9294f4..6648fe1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2022.12.tar.xz) = e1a507955605f4e9519e7825e857454cead20a033e6f3068926c04d4149950f8a877757a983e4f54bedd1b011099a8024cb7c931ecda5b0a0a4f4e7a0f7dca9d +SHA512 (rpm-ostree-2022.13.tar.xz) = 09f8d7554d694e8fbd61d713d0b01f3076c3638f81698fc8208055e11fc6f1e79f77d8e18386ef579a819b8db5c26178b3926775d87e2eb1a47e0ebf9c606a89