From 451ba2fce6b1bea90edc97a287abedc38ca2e8c4 Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Sat, 10 Dec 2016 12:47:27 -0800 Subject: [PATCH 1/2] Use %{sogo_version} defined in required rpmmacros. --- packaging/rhel/sope.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/rhel/sope.spec b/packaging/rhel/sope.spec index ecd5e4f79..009ab86ca 100644 --- a/packaging/rhel/sope.spec +++ b/packaging/rhel/sope.spec @@ -16,7 +16,7 @@ AutoReqProv: off Source: %{sope_source} Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildPreReq: gnustep-make gcc-objc postgresql-devel +BuildRequires: gnustep-make gcc-objc postgresql-devel openldap-devel gnustep-base-devel gnustep-base libxml2-devel gmp-devel avahi-devel gnutls-devel libgcrypt-devel libffi-devel libxslt-devel libicu-devel %{?el5:BuildRequires: mysql-devel} %{?el6:BuildRequires: mysql-devel} @@ -287,7 +287,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE. %prep rm -fr ${RPM_BUILD_ROOT} -%setup -q -n SOPE +%setup -q -n sope-SOPE-%{sogo_version} # ****************************** build ******************************** %build From a591b9879dd497539fccf57ebd7d50a9840af79a Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Sat, 10 Dec 2016 12:47:27 -0800 Subject: [PATCH 2/2] Update spec so that the package builds under mock. --- packaging/rhel/sope.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/rhel/sope.spec b/packaging/rhel/sope.spec index ecd5e4f79..009ab86ca 100644 --- a/packaging/rhel/sope.spec +++ b/packaging/rhel/sope.spec @@ -16,7 +16,7 @@ AutoReqProv: off Source: %{sope_source} Prefix: /usr BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildPreReq: gnustep-make gcc-objc postgresql-devel +BuildRequires: gnustep-make gcc-objc postgresql-devel openldap-devel gnustep-base-devel gnustep-base libxml2-devel gmp-devel avahi-devel gnutls-devel libgcrypt-devel libffi-devel libxslt-devel libicu-devel %{?el5:BuildRequires: mysql-devel} %{?el6:BuildRequires: mysql-devel} @@ -287,7 +287,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE. %prep rm -fr ${RPM_BUILD_ROOT} -%setup -q -n SOPE +%setup -q -n sope-SOPE-%{sogo_version} # ****************************** build ******************************** %build