Commit 42418ff0 authored by Mattias Ellert's avatar Mattias Ellert

Disable LDAP service for Fedora 32+ and EPEL 8+

parent 341243bb
......@@ -114,6 +114,13 @@
%global use_systemd 0
%endif
%if %{?fedora}%{!?fedora:0} >= 32 || %{?rhel}%{!?rhel:0} >= 8
# LDAP service requires bdii which is not ported to Python 3
%global with_ldap_service 0
%else
%global with_ldap_service 1
%endif
#
# Macros for scripts
#
......@@ -189,6 +196,11 @@ Obsoletes: %{name}-egiis < 6.0.0
Obsoletes: python2-%{name} < %{version}-%{release}
Obsoletes: %{name}-python < 5.3.3
%endif
%if ! %{with_ldap_service}
Obsoletes: %{name}-infosys-ldap < %{version}-%{release}
Obsoletes: %{name}-ldap-infosys < 6.0.0
Obsoletes: %{name}-aris < 6.0.0
%endif
BuildRequires: gcc-c++
BuildRequires: cppunit-devel
......@@ -378,6 +390,7 @@ Connector (ARC).
This package contains the ARC data delivery service.
%if %{with_ldap_service}
%package infosys-ldap
Summary: ARC LDAP-based information services
Group: System Environment/Libraries
......@@ -420,6 +433,7 @@ This package contains the ARC information services relying on BDII and
LDAP technologies to publish ARC CE information according to various
LDAP schemas. Please note that the information collectors are part of
another package, the nordugrid-arc-arex.
%endif
%package monitor
Summary: ARC LDAP monitor web application
......@@ -857,6 +871,9 @@ fi
%if %{use_systemd}
--enable-systemd \
--with-systemd-units-location=%{_unitdir} \
%endif
%if ! %{with_ldap_service}
--disable-ldap-service \
%endif
--disable-doc \
--docdir=%{_pkgdocdir}
......@@ -877,8 +894,10 @@ install -p -m 644 debian/%{name}-arex.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-arex
install -p -m 644 debian/%{name}-gridftpd.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-gridftpd
%if %{with_ldap_service}
install -p -m 644 debian/%{name}-infosys-ldap.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-infosys-ldap
%endif
install -p -m 644 debian/%{name}-datadelivery-service.logrotate \
$RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}-datadelivery-service
......@@ -976,6 +995,7 @@ fi
%postun datadelivery-service
%condrestart_on_update arc-datadelivery-service
%if %{with_ldap_service}
%post infosys-ldap
%enable_service arc-infosys-ldap
......@@ -1020,6 +1040,7 @@ FIRST_ARG=1
%else
service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%endif
%endif
%if %{with_acix}
%post acix-scanner
......@@ -1175,6 +1196,7 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-gridftpd
%doc %{_mandir}/man8/gridftpd.8*
%if %{with_ldap_service}
%files infosys-ldap
%defattr(-,root,root,-)
%if %{use_systemd}
......@@ -1189,6 +1211,7 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{_datadir}/%{pkgdir}/glite-info-provider-ldap
%{_datadir}/%{pkgdir}/ldap-schema
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-infosys-ldap
%endif
%files monitor
%defattr(-,root,root,-)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment