fix(packaging): fixed centos 7 (saml) and centos 8 builds

pull/278/head
Ludovic Marcotte 2020-05-15 10:32:56 -04:00
parent 0c47b639b2
commit 47d01326c9
1 changed files with 5 additions and 2 deletions

View File

@ -50,9 +50,12 @@ BuildRequires: gcc-objc gnustep-base gnustep-make sope%{sope_major_version}%{so
# saml is enabled everywhere except on el5 since its glib2 is prehistoric # saml is enabled everywhere except on el5 since its glib2 is prehistoric
%define saml2_cfg_opts "--enable-saml2" %define saml2_cfg_opts "--enable-saml2"
%{?el5:%define saml2_cfg_opts ""} %{?el5:%define saml2_cfg_opts ""}
%{?el7:%define saml2_cfg_opts ""}
%{?el6:Requires: lasso} %{?el6:Requires: lasso}
%{?el6:BuildRequires: lasso-devel} %{?el6:BuildRequires: lasso-devel}
%{?el7:Requires: lasso}
%{?el7:BuildRequires: lasso-devel}
%{?el8:Requires: lasso}
%{?el8:BuildRequires: lasso-devel}
%description %description
SOGo is a groupware server built around OpenGroupware.org (OGo) and SOGo is a groupware server built around OpenGroupware.org (OGo) and
@ -182,7 +185,7 @@ rm -fr ${RPM_BUILD_ROOT}
# ****************************** build ******************************** # ****************************** build ********************************
%build %build
%if 0%{?el7} %if 0%{?rhel} >= 7
. /usr/lib64/GNUstep/Makefiles/GNUstep.sh . /usr/lib64/GNUstep/Makefiles/GNUstep.sh
%else %else
. /usr/share/GNUstep/Makefiles/GNUstep.sh . /usr/share/GNUstep/Makefiles/GNUstep.sh