From: František Dvořák <valtri@civ.zcu.cz>
Date: Thu, 18 Oct 2012 16:17:01 +0000 (+0000)
Subject: Build on Fedora and EPEL 6 (curl -> libcurl).
X-Git-Tag: gridsite-core_R_2_0_1~8
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=73f778508d5e9436582084ac5b7bc5cb1b04f3ce;p=jra1mw.git

Build on Fedora and EPEL 6 (curl -> libcurl).
---

diff --git a/org.gridsite.core/src/make-gridsite-spec b/org.gridsite.core/src/make-gridsite-spec
index a1b172e..a26c6bf 100755
--- a/org.gridsite.core/src/make-gridsite-spec
+++ b/org.gridsite.core/src/make-gridsite-spec
@@ -49,9 +49,14 @@ Source: %{name}-%{version}.src.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 URL: http://www.gridsite.org/
 Vendor: GridPP
-BuildRequires: libxml2-devel%{?_isa},curl-devel%{?_isa},httpd-devel%{?_isa},openssl-devel%{?_isa},pkgconfig
+BuildRequires: libxml2-devel%{?_isa},httpd-devel%{?_isa},openssl-devel%{?_isa},pkgconfig
 BuildRequires: doxygen${gsoapdep}${globusdep}
 BuildRequires: canl-c-devel%{?_isa}
+%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:  libcurl-devel%{?_isa}
+%else
+BuildRequires:  curl-devel%{?_isa}
+%endif
 Packager: Andrew McNab <Andrew.McNab@manchester.ac.uk>
 Provides: gridsite-apache = %{version}-%{release}
 Obsoletes: gridsite-apache <= 1.7.21