From 17086bb4051f8ab74fcb67a85fdfbed1091e6788 Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Sat, 10 Dec 2016 12:37:08 -0800 Subject: [PATCH 1/3] 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 a84b288ed..8b395a06e 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-3.2.3 # ****************************** build ******************************** %build From 1f25b0c319e5051235d46077c9e0faccc0de3117 Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Sat, 10 Dec 2016 12:41:58 -0800 Subject: [PATCH 2/3] Use %{sogo_version} defined in required rpmmacros. --- packaging/rhel/sope.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rhel/sope.spec b/packaging/rhel/sope.spec index 8b395a06e..a0377ba26 100644 --- a/packaging/rhel/sope.spec +++ b/packaging/rhel/sope.spec @@ -287,7 +287,7 @@ name "SOPE" (SKYRiX Object Publishing Environment) is inspired by ZOPE. %prep rm -fr ${RPM_BUILD_ROOT} -%setup -q -n sope-SOPE-3.2.3 +%setup -q -n sope-SOPE-%{sogo_version} # ****************************** build ******************************** %build From 5f1c21ca4dbe55914244db88da7c4e3f8f63f53c Mon Sep 17 00:00:00 2001 From: Gordon Messmer Date: Tue, 24 Jul 2018 21:56:41 -0700 Subject: [PATCH 3/3] Explicitly require python for the build. --- packaging/rhel/sope.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rhel/sope.spec b/packaging/rhel/sope.spec index a0377ba26..559c97ddc 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 -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 +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 python %{?el5:BuildRequires: mysql-devel} %{?el6:BuildRequires: mysql-devel}