- added curl patch (fixes build with curl 7.62+)

- use libtirpc for XDR
- release 2

diff --git a/ocapi-curl.patch b/ocapi-curl.patch
new file mode 100644 (file)
index 0000000..398b60c
--- /dev/null
+++ b/ocapi-curl.patch
@@ -0,0 +1,13 @@
+--- ocapi-1.4.3/http.c.orig    2009-01-28 00:57:36.000000000 +0100
++++ ocapi-1.4.3/http.c 2020-11-26 16:46:20.551788109 +0100
+@@ -862,8 +862,10 @@
+               return "problem with the local client certificate";
+       case CURLE_SSL_CIPHER:
+               return "specified cipher unusable";
++#if CURLE_SSL_CACERT != CURLE_PEER_FAILED_VERIFICATION
+       case CURLE_SSL_CACERT:
+               return "problem with the CA cert (path? access rights?)";
++#endif
+       case CURLE_BAD_CONTENT_ENCODING:
+               return "Unrecognized transfer encoding";
+ 

diff --git a/ocapi.spec b/ocapi.spec
index 92e8c2698b005174b175951d717c9a0f87746630..3caf065adb1600cf7c25cdf056a285dd151ca1ae 100644 (file)
--- a/ocapi.spec
+++ b/ocapi.spec
@@ -6,18 +6,20 @@ Summary:      The OPeNDAP C DAP2 library (client-side only)
 Summary(pl.UTF-8):     Biblioteka OPeNDAP DAP2 dla C (tylko strona kliencka)
 Name:          ocapi
 Version:       1.4.3
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://www.opendap.org/pub/OCAPI/source/%{name}-%{version}.tar.gz
 # Source0-md5: c1a4f9391d7f88b0f9e93bfcb9c5181f
 Patch0:                %{name}-libdir.patch
+Patch1:                %{name}-curl.patch
 URL:           http://opendap.org/ocapi/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: curl-devel >= 7.10.6
+BuildRequires: libtirpc-devel
 BuildRequires: libtool
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -50,6 +52,9 @@ Summary(pl.UTF-8):    Pliki nagłówkowe biblioteki OCAPI
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      curl-devel >= 7.10.6
+Requires:      libtirpc-devel
+Requires:      ncurses-devel
+Requires:      readline-devel
 
 %description devel
 Header files for OCAPI library.
@@ -72,6 +77,7 @@ Statyczna biblioteka OCAPI.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -79,7 +85,9 @@ Statyczna biblioteka OCAPI.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+       CPPFLAGS="%{rpmcppflags} -I/usr/include/tirpc" \
+       LIBS="-ltirpc"
 %{__make}
 
 %{?with_tests:%{__make} check}