[cpp-linbuild] 02/04: Remove obsolete shibboleth.spec conditionals

[Codeberg]

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

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

View the commit online:
https://codeberg.org/Shibboleth/cpp-linbuild/commit/6254a0019bb1982c69b1d1e360165a15de66f70b

commit 6254a0019bb1982c69b1d1e360165a15de66f70b
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Sat Feb 14 22:14:54 2026 +0000

    Remove obsolete shibboleth.spec conditionals
    
    Every platform for which we currently build RPMs either sets
    %_vendor to "redhat" and %rhel to >= 7, or $_vendor to "amazon"
    and %amzn to >= 2. All removals are for no-op conditionals.
---
 common/SPECS/shibboleth-sp.spec | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/common/SPECS/shibboleth-sp.spec b/common/SPECS/shibboleth-sp.spec
index c9ade7a..18c899c 100644
--- a/common/SPECS/shibboleth-sp.spec
+++ b/common/SPECS/shibboleth-sp.spec
@@ -14,15 +14,9 @@ BuildRequires: gcc-c++
 BuildRequires: pkgconfig
 BuildRequires: boost-devel >= 1.32.0
 %{?_with_fastcgi:BuildRequires: fcgi-devel}
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-%if 0%{?rhel} >= 7 || 0%{?amzn} == 2
 %{!?_without_builtinapache:BuildRequires: httpd-devel%{?_isa}}
-%else
-%{!?_without_builtinapache:BuildRequires: httpd-devel}
-%endif
 BuildRequires: redhat-rpm-config
 Requires(pre): shadow-utils
-%endif
 
 %define pkgdocdir %{_docdir}/%{name}-%{version}
 
@@ -85,22 +79,18 @@ fi
 
 %preun
 # On final removal, restart Apache if running.
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
-    if [ $1 -eq 0 ] ; then
-        %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
-        exit 0
-    fi
-%endif
+if [ $1 -eq 0 ] ; then
+    %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
+exit 0
+fi
 exit 0
 
 %postun
-%if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon"
 # On upgrade, restart Apache if running.
-    if [ $1 -ge 1 ] ; then
-        %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
-        exit 0
-    fi
-%endif
+if [ $1 -ge 1 ] ; then
+    %{!?_without_builtinapache:/sbin/service httpd status 1>/dev/null && /sbin/service httpd restart 1>/dev/null}
+exit 0
+fi
 
 %posttrans
 exit 0

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