From 47d01326c96a2d7b7946dd9d114406b7afbea628 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 15 May 2020 10:32:56 -0400 Subject: [PATCH] fix(packaging): fixed centos 7 (saml) and centos 8 builds --- packaging/rhel/sogo.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/packaging/rhel/sogo.spec b/packaging/rhel/sogo.spec index 6829cd0f4..9554b0c8b 100644 --- a/packaging/rhel/sogo.spec +++ b/packaging/rhel/sogo.spec @@ -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 %define saml2_cfg_opts "--enable-saml2" %{?el5:%define saml2_cfg_opts ""} -%{?el7:%define saml2_cfg_opts ""} %{?el6:Requires: lasso} %{?el6:BuildRequires: lasso-devel} +%{?el7:Requires: lasso} +%{?el7:BuildRequires: lasso-devel} +%{?el8:Requires: lasso} +%{?el8:BuildRequires: lasso-devel} %description SOGo is a groupware server built around OpenGroupware.org (OGo) and @@ -182,7 +185,7 @@ rm -fr ${RPM_BUILD_ROOT} # ****************************** build ******************************** %build -%if 0%{?el7} +%if 0%{?rhel} >= 7 . /usr/lib64/GNUstep/Makefiles/GNUstep.sh %else . /usr/share/GNUstep/Makefiles/GNUstep.sh