Commit 6f2f263c authored by Clément OUDOT's avatar Clément OUDOT

Merge branch 'el7' into 'v2.0'

Improve RPM Requires: filtering

See merge request lemonldap-ng/lemonldap-ng!54

(cherry picked from commit bc100d05)

c305da5c Split Fedora requires filtering from EL filtering
35919e8d Sentry::Raven is available for Fedora
36985b50 Net::OpenID::Server is available in Fedora
bf8de0a7 Don't filter Requires on XML::LibXSLT
c88b9cf3 Don't filter Requires on XML::LibXML
8a6e4d61 Web::ID is available in Fedora
aee9ee3f Lasso is available in Fedora 29+
eb4c7357 Fix Lasso Requires filtering
afc7c8e2 Use macro to define httpd log dir
d5827c6f Net::OpenID::Server is available in EPEL7
bb9e0ef8 Drop EL6 support, perl in EL6 is too old for the code base anyway
bda04bf5 XML::LibXSLT is already BR:'ed, no need to filter the corresponding Requires:
056ff5ba XML::LibXML is available for EL7
7fadd39c Fix Lasso Requires filtering (EL7)
5abb193c Fix Version:, 2.0.2 has not been tagged yet
023cfb1d Fix %preun to not erroneously wipe httpd conf files
parent bdfc905a
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
# Main package # Main package
#============================================================================== #==============================================================================
Name: lemonldap-ng Name: lemonldap-ng
Version: 2.0.2 Version: 2.0.1
Release: %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist} Release: %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist}
Summary: LemonLDAP-NG WebSSO Summary: LemonLDAP-NG WebSSO
License: GPLv2+ License: GPLv2+
...@@ -98,12 +98,9 @@ BuildRequires: perl(Digest::HMAC_SHA1) ...@@ -98,12 +98,9 @@ BuildRequires: perl(Digest::HMAC_SHA1)
BuildRequires: perl(Digest::MD5) BuildRequires: perl(Digest::MD5)
BuildRequires: perl(Digest::SHA) BuildRequires: perl(Digest::SHA)
BuildRequires: perl(Email::Date::Format) BuildRequires: perl(Email::Date::Format)
# Not available for EL6
%if ! 0%{?el6}
BuildRequires: perl(Email::Sender) BuildRequires: perl(Email::Sender)
BuildRequires: perl(Email::Sender::Simple) BuildRequires: perl(Email::Sender::Simple)
BuildRequires: perl(Email::Sender::Transport::SMTP) BuildRequires: perl(Email::Sender::Transport::SMTP)
%endif
BuildRequires: perl(Encode) BuildRequires: perl(Encode)
BuildRequires: perl(English) BuildRequires: perl(English)
BuildRequires: perl(Env) BuildRequires: perl(Env)
...@@ -125,6 +122,10 @@ BuildRequires: perl(IO::Select) ...@@ -125,6 +122,10 @@ BuildRequires: perl(IO::Select)
BuildRequires: perl(IO::Socket::INET) BuildRequires: perl(IO::Socket::INET)
BuildRequires: perl(IO::String) BuildRequires: perl(IO::String)
BuildRequires: perl(JSON) BuildRequires: perl(JSON)
%if 0%{?fedora} >= 29
BuildRequires: perl(Lasso)
BuildRequires: perl(Glib)
%endif
BuildRequires: perl(Log::Log4perl) BuildRequires: perl(Log::Log4perl)
BuildRequires: perl(LWP::Protocol::https) BuildRequires: perl(LWP::Protocol::https)
BuildRequires: perl(LWP::UserAgent) BuildRequires: perl(LWP::UserAgent)
...@@ -135,6 +136,7 @@ BuildRequires: perl(Mouse) ...@@ -135,6 +136,7 @@ BuildRequires: perl(Mouse)
BuildRequires: perl(Net::LDAP) BuildRequires: perl(Net::LDAP)
BuildRequires: perl(Net::LDAP::Extension::SetPassword) BuildRequires: perl(Net::LDAP::Extension::SetPassword)
BuildRequires: perl(Net::LDAP::Util) BuildRequires: perl(Net::LDAP::Util)
BuildRequires: perl(Net::OpenID::Server)
BuildRequires: perl(Plack) BuildRequires: perl(Plack)
BuildRequires: perl(Plack::Handler::CGI) BuildRequires: perl(Plack::Handler::CGI)
BuildRequires: perl(Plack::Handler::FCGI) BuildRequires: perl(Plack::Handler::FCGI)
...@@ -148,8 +150,9 @@ BuildRequires: perl(Regexp::Assemble) ...@@ -148,8 +150,9 @@ BuildRequires: perl(Regexp::Assemble)
BuildRequires: perl(Regexp::Common) BuildRequires: perl(Regexp::Common)
BuildRequires: perl(Safe) BuildRequires: perl(Safe)
BuildRequires: perl(Scalar::Util) BuildRequires: perl(Scalar::Util)
# https://bugzilla.redhat.com/show_bug.cgi?id=1644266 %if 0%{?fedora}
#BuildRequires: perl(Sentry::Raven) BuildRequires: perl(Sentry::Raven)
%endif
BuildRequires: perl(SOAP::Lite) BuildRequires: perl(SOAP::Lite)
BuildRequires: perl(SOAP::Transport::HTTP) BuildRequires: perl(SOAP::Transport::HTTP)
BuildRequires: perl(strict) BuildRequires: perl(strict)
...@@ -164,12 +167,14 @@ BuildRequires: perl(URI::Escape) ...@@ -164,12 +167,14 @@ BuildRequires: perl(URI::Escape)
BuildRequires: perl(URI::URL) BuildRequires: perl(URI::URL)
BuildRequires: perl(utf8) BuildRequires: perl(utf8)
BuildRequires: perl(warnings) BuildRequires: perl(warnings)
%if 0%{?fedora}
BuildRequires: perl(Web::ID)
%endif
BuildRequires: perl(XML::LibXML)
BuildRequires: perl(XML::LibXSLT) BuildRequires: perl(XML::LibXSLT)
BuildRequires: perl(XML::Simple) BuildRequires: perl(XML::Simple)
BuildRequires: perl(YAML) BuildRequires: perl(YAML)
%if 0%{?fedora} || 0%{?rhel} >= 7
BuildRequires: systemd BuildRequires: systemd
%endif
Requires: lemonldap-ng-conf = %{version}-%{release} Requires: lemonldap-ng-conf = %{version}-%{release}
Requires: lemonldap-ng-doc = %{version}-%{release} Requires: lemonldap-ng-doc = %{version}-%{release}
...@@ -179,14 +184,16 @@ Requires: lemonldap-ng-portal = %{version}-%{release} ...@@ -179,14 +184,16 @@ Requires: lemonldap-ng-portal = %{version}-%{release}
Requires: lemonldap-ng-test = %{version}-%{release} Requires: lemonldap-ng-test = %{version}-%{release}
# Setup requires filtering # Setup requires filtering
%if 0%{?rhel} == 6 %if 0%{?rhel} >= 7
%filter_from_requires /perl(lasso/d; /perl(Net::OpenID/d; /perl(Web::ID/d; /perl(XML::LibXML/d; /perl(XML::LibXSLT/d; /perl(Sentry::Raven/d; %{?perl_default_filter}
%filter_setup %global __requires_exclude perl\\(Lasso|perl\\(Web::ID|perl\\(Sentry::Raven
%endif %endif
%if 0%{?fedora} || 0%{?rhel} >= 7 %if 0%{?fedora}
%{?perl_default_filter} %{?perl_default_filter}
%global __requires_exclude perl\\(lasso|perl\\(Net::OpenID|perl\\(Web::ID|perl\\(XML::LibXML|perl\\(XML::LibXSLT|perl\\(Sentry::Raven %if 0%{?fedora} < 29
%global __requires_exclude perl\\(Lasso
%endif
%endif %endif
%description %description
...@@ -387,7 +394,7 @@ This package installs the authentication portal. ...@@ -387,7 +394,7 @@ This package installs the authentication portal.
ETCDEFAULTDIR=%{_sysconfdir}/default \ ETCDEFAULTDIR=%{_sysconfdir}/default \
DNSDOMAIN=%{lm_dnsdomain} \ DNSDOMAIN=%{lm_dnsdomain} \
APACHEVERSION=%{apache_version} \ APACHEVERSION=%{apache_version} \
APACHELOGDIR=/var/log/httpd \ APACHELOGDIR=%{_localstatedir}/log/httpd \
UWSGIYAMLDIR=%{_sysconfdir}/uwsgi/apps-available \ UWSGIYAMLDIR=%{_sysconfdir}/uwsgi/apps-available \
LLNGAPPDIR=%{lm_sharedir}/llng-server \ LLNGAPPDIR=%{lm_sharedir}/llng-server \
PROD=yes PROD=yes
...@@ -522,7 +529,8 @@ fi ...@@ -522,7 +529,8 @@ fi
# Upgrade from previous version # Upgrade from previous version
if [ $1 -eq 1 ] ; then if [ $1 -eq 1 ] ; then
# Remove old symlinks in Apache configuration # Remove old symlinks in Apache configuration
rm -f %{apache_confdir}/z-lemonldap-ng*.conf 2>&1 > /dev/null || : find %{apache_confdir} -name 'z-lemonldap-ng*.conf' \
-type l -delete 2>&1 > /dev/null || :
fi fi
%post fastcgi-server %post fastcgi-server
......
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