From af9592a027c4ebac3491659a2d4b62728fa2832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Wed, 29 May 2024 10:05:33 +0200 Subject: [PATCH] Remove autorelease - rpmautospec is not available for rhel-9 yet related: RHEL-33645 --- samba.spec | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/samba.spec b/samba.spec index 8147378..9157617 100644 --- a/samba.spec +++ b/samba.spec @@ -147,23 +147,13 @@ %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %global samba_version 4.20.1 - -# The release field is extended: -# [.][.]%%{?dist}[.] -# Square brackets indicate an optional item. -# -# The autorelease macro accepts these parameters to allow packagers to specify -# those added fields: -# -# -p: Designates a pre-release, i.e. pkgrel will be prefixed with '0.'. -# -e : Allows specifying the extraver portion of the release. -# -b : Allows specifying a custom base release number (the -# default is 1). -%global samba_release %autorelease - +%global baserelease 1 +# This should be rc1 or %%nil %global pre_release %nil + +%global samba_release %{baserelease} %if "x%{?pre_release}" != "x" -%global samba_release %autorelease -p -e %pre_release +%global samba_release 0.%{baserelease}.%{pre_release} %endif @@ -215,7 +205,7 @@ Name: samba Version: %{samba_version} -Release: %{samba_release} +Release: %{samba_release}%{?dist} %if 0%{?fedora} Epoch: 2 @@ -4604,6 +4594,9 @@ fi %endif %changelog +* Wed May 29 2024 Pavel Filipenský - 4.20.1-1 +- related: RHEL-33645 - Remove autorelease - rpmautospec is not available for rhel-9 yet + * Tue May 28 2024 Pavel Filipenský - 4.20.1-1 - related: RHEL-33645 - Update to version 4.20.1 - resolves: RHEL-26337 - Fix site lookup for samba-gpupdate