From 238f2a78162cd8c9fe8ffbd27a15ca2d7656cdbc Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Tue, 10 Jun 2025 12:19:29 -0400 Subject: [PATCH] podman-5.5.1-2.el10 - Remove copr related seds from spec - Related: RHEL-80817 - This will be useful in TMT tests on upstream RHEL maintenance branches. Signed-off-by: Lokesh Mandvekar --- podman.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/podman.spec b/podman.spec index efeb425..c874b7f 100644 --- a/podman.spec +++ b/podman.spec @@ -63,7 +63,7 @@ Epoch: 6 Version: 5.5.1 # The `AND` needs to be uppercase in the License for SPDX compatibility License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 -Release: 1%{?dist} +Release: 2%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -249,14 +249,6 @@ cp %{SOURCE4} test/system/. cp %{SOURCE5} test/system/. %endif -# These changes are only meant for copr builds -%if %{defined copr_build} -# podman --version should show short sha -sed -i "s/^const RawVersion = .*/const RawVersion = \"##VERSION##-##SHORT_SHA##\"/" version/rawversion/version.go -# use ParseTolerant to allow short sha in version -sed -i "s/^var Version.*/var Version, err = semver.ParseTolerant(rawversion.RawVersion)/" version/version.go -%endif - %build %set_build_flags export CGO_CFLAGS=$CFLAGS @@ -410,6 +402,10 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %endif %changelog +* Tue Jun 10 2025 Lokesh Mandvekar - 6:5.5.1-2 +- Remove copr related seds from spec +- Related: RHEL-80817 + * Mon Jun 09 2025 Jindrich Novy - 6:5.5.1-1 - update to https://github.com/containers/podman/releases/tag/v5.5.1 - Related: RHEL-80817