From 0bdf6e07e88881d97b2970e5706d458eb20ea34a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 17 Jun 2024 10:03:16 +0200 Subject: [PATCH] Revert "Lock version at branchpoint" This reverts commit 0181246574816878af9be6b4284aefd14cfcda61. Resolves: RHEL-42436 --- redhat-rpm-config.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index 52258a6..f7cfd96 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -1,14 +1,15 @@ # TO WHOM IT MAY CONCERN # # 1) Don't add patches, dist-git is the upstream repository for this package. -# 2) When making changes, use rpmdev-bumpspec to bump Release. Version should -# not be changed, so as to make it clear from which point it branched from -# Fedora redhat-rpm-config. +# 2) When making changes, increment the version (in baserelease) by 1. +# rpmdev-bumpspec and other tools update the macro below, which is used +# in Version: to get the desired effect. +%global baserelease 283 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 282 -Release: 4%{?dist} +Version: %{baserelease} +Release: 1%{?dist} # config.guess, config.sub are GPL-3.0-or-later WITH Autoconf-exception-generic License: GPL-1.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later WITH Autoconf-exception-generic AND Boehm-GC URL: https://src.fedoraproject.org/rpms/redhat-rpm-config @@ -256,6 +257,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua %doc buildflags.md %changelog +* Mon Jun 17 2024 Florian Weimer - 283-1 +- Switch back to traditional Version: management (RHEL-42436) + * Fri Jun 7 2024 Florian Weimer - 282-4 - Enable DT_RELR on aarch64 (RHEL-40379)