[cpp-linbuild] 11/15: Drop support for RHEL 5

[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=fa7c93b29ac1d1344ae45f84898d596c7a224f19

commit fa7c93b29ac1d1344ae45f84898d596c7a224f19
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Fri Jun 16 14:40:06 2023 +0000

    Drop support for RHEL 5
---
 common/SPECS/shibboleth.spec   | 17 ++++++-----------
 common/SPECS/shibresolver.spec |  4 ----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/common/SPECS/shibboleth.spec b/common/SPECS/shibboleth.spec
index 4af662b..ef18605 100644
--- a/common/SPECS/shibboleth.spec
+++ b/common/SPECS/shibboleth.spec
@@ -130,9 +130,6 @@ This package includes files needed for development with Shibboleth.
 %else
 %if 0%{?rhel} >= 6
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with-memcached} %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
-%else
-%if 0%{?rhel} >= 5
-    %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/rh5
 %else
     %configure %{?_without_odbc:--disable-odbc} %{?_without_adfs:--disable-adfs} %{?_with_fastcgi} %{!?_without_gssapi:--with-gssapi} %{?_with_memcached} %{?shib_options}
 %endif
@@ -141,7 +138,6 @@ This package includes files needed for development with Shibboleth.
 %endif
 %endif
 %endif
-%endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install
@@ -273,12 +269,11 @@ fi
 
 %if "%{_vendor}" == "redhat" || "%{_vendor}" == "amazon" || "%{_vendor}" == "suse"
 if [ "$SYSTEMD_SHIBD" == "no" ] ; then
-    # %%{_initddir} not yet in RHEL5, use deprecated %%{_initrddir}
-    install -d -m 0755 $RPM_BUILD_ROOT%{_initrddir}
-    install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initrddir}/shibd
+    install -d -m 0755 $RPM_BUILD_ROOT%{_initddir}
+    install -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/shibboleth/shibd-%{_vendor} $RPM_BUILD_ROOT%{_initddir}/shibd
 %if "%{_vendor}" == "suse"
     install -d -m 0755 $RPM_BUILD_ROOT/%{_sbindir}
-    %{__ln_s} -f %{_initrddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
+    %{__ln_s} -f %{_initddir}/shibd $RPM_BUILD_ROOT%{_sbindir}/rcshibd
 %endif
 fi
 %endif
@@ -453,14 +448,14 @@ exit 0
 %if "%{_vendor}" == "redhat"
 %if 0%{?rhel} >= 7
 %else
-%config %{_initrddir}/shibd
+%config %{_initddir}/shibd
 %endif
 %endif
 %if "%{_vendor}" == "amazon"
-%config %{_initrddir}/shibd
+%config %{_initddir}/shibd
 %endif
 %if "%{_vendor}" == "suse" && 0%{?suse_version} < 1210
-%config %{_initrddir}/shibd
+%config %{_initddir}/shibd
 %{_sbindir}/rcshibd
 %endif
 %if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
diff --git a/common/SPECS/shibresolver.spec b/common/SPECS/shibresolver.spec
index 49c2616..0ffdd67 100644
--- a/common/SPECS/shibresolver.spec
+++ b/common/SPECS/shibresolver.spec
@@ -81,16 +81,12 @@ This package includes files needed for development.
 %else
 %if 0%{?rhel} >= 6
     %configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
-%else
-%if 0%{?rhel} >= 5
-    %configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=./pkgconfig-workarounds/rh5
 %else
     %configure --with-gssapi %{?shib_options}
 %endif
 %endif
 %endif
 %endif
-%endif
 %{__make} pkgdocdir=%{pkgdocdir}
 
 %install

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