[cpp-linbuild] branch main updated: SSPCPP-987 Include missed conversion from SysV to SystemD for AL2023

[John W. O'Brien]

This is an automated email from the git hooks/post-receive script.

obrienjw pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=7c364540e203efa2a46a76d849e1916544eb1abc

The following commit(s) were added to refs/heads/main by this push:
     new 7c36454  SSPCPP-987 Include missed conversion from SysV to SystemD for AL2023
7c36454 is described below

commit 7c364540e203efa2a46a76d849e1916544eb1abc
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sun Jun 30 16:06:43 2024 +0000

    SSPCPP-987 Include missed conversion from SysV to SystemD for AL2023
---
 common/SPECS/shibboleth.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index 78ba565..c515b39 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -1,6 +1,6 @@
 Name: shibboleth
 Version: 3.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Open source system for attribute-based Web SSO
 Group: Productivity/Networking/Security
 Vendor: Shibboleth Consortium
@@ -181,7 +181,7 @@ fi
 
 # Establish location of systemd file, if any.
 SYSTEMD_SHIBD="no"
-%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?amzn2023}
     %{__mkdir} -p $RPM_BUILD_ROOT%{_unitdir}
     echo "%attr(0444,-,-) %{_unitdir}/shibd.service" >> rpm.filelist
     SYSTEMD_SHIBD="$RPM_BUILD_ROOT%{_unitdir}/shibd.service"
@@ -451,7 +451,7 @@ exit 0
 %config %{_initddir}/shibd
 %endif
 %endif
-%if "%{_vendor}" == "amazon"
+%if "%{_vendor}" == "amazon" && 0%{?amzn} == 2
 %config %{_initddir}/shibd
 %endif
 %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
@@ -480,6 +480,9 @@ exit 0
 %doc %{pkgdocdir}/api
 
 %changelog
+* Sun Jun 30 2024 John W. O'Brien <john at saltant.com> - 3.4.1-4
+- SSPCPP-987 Include missed conversion from SysV to SystemD for AL2023
+
 * Sat Jun 17 2023 John W. O'Brien <john at saltant.com> - 3.4.1-3
 - Normalize SPEC file whitespace
 - Delete obsolete BuildRoot macro

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.