From 8e67d7e84a0e74b7d86bdb8cbc43a3f159679839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 11 Mar 2026 14:55:07 +0100 Subject: [PATCH 1/2] Use macro rather than shell expansion for string processing in spec file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nikola Forró Reviewed-by: Tomáš Halman (cherry picked from commit f9697d4ff3fc1e1df5a9ed9c069c8ca045244a14) --- contrib/sssd.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index c9b869795f8..7f962d3055b 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -5,7 +5,6 @@ # RHEL requires tilde as a separator to correctly order builds. # For example: 2.10.0-beta1 vs 2.10.0~beta1 %global upstream_version @PACKAGE_VERSION@ -%global downstream_version %(echo "@PACKAGE_VERSION@" | sed 's/-/~/g') # define SSSD user %if 0%{?rhel} @@ -54,7 +53,7 @@ %global samba_package_version %(rpm -q samba-devel --queryformat %{version}) Name: @PACKAGE_NAME@ -Version: %{downstream_version} +Version: %{gsub @PACKAGE_VERSION@ - ~} Release: 0@PRERELEASE_VERSION@%{?dist} Summary: System Security Services Daemon License: GPLv3+ From 6b297f664006b3195dbee05c25a0845cb8c950b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 11 Mar 2026 15:21:16 +0100 Subject: [PATCH 2/2] Add a default for %samba_package_version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nikola Forró Reviewed-by: Tomáš Halman (cherry picked from commit caa0ec2280c64d6f36db414761b74e8b4b7674d0) --- contrib/sssd.spec.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 7f962d3055b..4c36e6de0b5 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -52,6 +52,10 @@ %global samba_package_version %(rpm -q samba-devel --queryformat %{version}) +%if "%{?samba_package_version}" == "" +%global samba_package_version 4.19 +%endif + Name: @PACKAGE_NAME@ Version: %{gsub @PACKAGE_VERSION@ - ~} Release: 0@PRERELEASE_VERSION@%{?dist}