diff --git a/.gitignore b/.gitignore index 183c910..253eb6b 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ /rpm-ostree-2025.1.tar.xz /rpm-ostree-2025.2.tar.xz /rpm-ostree-2025.3.tar.xz +/rpm-ostree-2025.4.tar.xz diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 0282b8b..db0a741 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -3,7 +3,7 @@ Summary: Hybrid image/package system Name: rpm-ostree -Version: 2025.3 +Version: 2025.4 Release: 1%{?dist} License: LGPL-2.0-or-later URL: https://github.com/coreos/rpm-ostree @@ -39,12 +39,6 @@ BuildRequires: rust %else %bcond_without ostree_ext %endif -# Integrate with kernel-install -%if 0%{?rhel} >= 10 || 0%{?fedora} > 41 - %bcond_with kernel_install -%else - %bcond_without kernel_install -%endif # This is copied from the libdnf spec %if 0%{?rhel} && ! 0%{?centos} @@ -224,9 +218,6 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt %if %{without ostree_ext} rm -vrf $RPM_BUILD_ROOT/usr/libexec/libostree/ext %endif -%if %{without kernel_install} -rm -vr $RPM_BUILD_ROOT/usr/lib/kernel/install.d -%endif find $RPM_BUILD_ROOT -name '*.la' -delete # I try to do continuous delivery via rpmdistro-gitoverlay while @@ -310,7 +301,11 @@ fi %files devel -f files.devel %changelog -* Thu Jan 27 2025 Joseph Marrero - 2025.3-1 +* Thu Jan 30 2025 Joseph Marrero - 2025.4-1 +- Rebase to 2025.4 + Resolves: #RHEL-68131 + +* Mon Jan 27 2025 Joseph Marrero - 2025.3-1 - Rebase to 2025.3 Resolves: #RHEL-68131 diff --git a/sources b/sources index e9e8443..70a5572 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpm-ostree-2025.3.tar.xz) = 5091a3b3912fe573e86fd9c4b753e1f492f0310a764f4feab85fb185a609ac5bbe16f1514ec317fae1398a20c030b9168e6ee89df638d4dabdd4f56e4d00d574 +SHA512 (rpm-ostree-2025.4.tar.xz) = 26335086ed7404face0e7d276ade75d5b289edf96eb661185f92f68034281138dc9b3d6453fc26b731c3e4669f98d1cd646f824204d2e0fbb9f62e80d21bc78c