From 507c287eb2530ba15b8bb324c109e62cb862c1b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Thu, 15 Mar 2018 10:36:19 +0100
Subject: [PATCH] - adapt to
 https://fedoraproject.org/wiki/Changes/SunRPCRemoval (#1556614)

---
 ogdi-3.2.0-rpc.patch | 21 +++++++++++++++++++++
 ogdi.spec            | 19 +++++++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 ogdi-3.2.0-rpc.patch

diff --git a/ogdi-3.2.0-rpc.patch b/ogdi-3.2.0-rpc.patch
new file mode 100644
index 0000000..2f938cc
--- /dev/null
+++ b/ogdi-3.2.0-rpc.patch
@@ -0,0 +1,21 @@
+diff -up ogdi-3.2.0/config/generic.mak.in.rpc ogdi-3.2.0/config/generic.mak.in
+--- ogdi-3.2.0/config/generic.mak.in.rpc	2018-03-15 10:12:20.000000000 +0100
++++ ogdi-3.2.0/config/generic.mak.in	2018-03-15 10:13:39.000000000 +0100
+@@ -35,7 +35,7 @@ AR		= ar cr
+ # Compilation and linking flags
+ #
+ SHLIB_CFLAGS	= @C_PIC@
+-COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1
++COMMON_CFLAGS	= $(OPTIMIZATION) @CFLAGS@ @C_WFLAGS@ -DUNIX=1 -I/usr/include/tirpc
+ 
+ SHLIB_LDFLAGS	= -shared 
+ COMMON_LDFLAGS  = $(OPTIMIZATION) 
+@@ -61,7 +61,7 @@ INST_BIN	= @bindir@
+ #
+ #RPC_LINKLIB	= -lrpcsvc -lnsl -lsocket
+ #RPC_LINKLIB	=	-ldl -ldbmalloc
+-RPC_LINKLIB	=	@LIBS@
++RPC_LINKLIB	= -ltirpc
+ 
+ #
+ # Endian definition, could be little or big
diff --git a/ogdi.spec b/ogdi.spec
index 6ca67fe..a7e9d16 100644
--- a/ogdi.spec
+++ b/ogdi.spec
@@ -1,6 +1,6 @@
 Name:           ogdi
 Version:        3.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Open Geographic Datastore Interface
 Group:          Applications/Engineering
 License:        BSD
@@ -9,9 +9,16 @@ Source0:        http://dl.sourceforge.net/ogdi/%{name}-%{version}.tar.gz
 Source1:        http://ogdi.sourceforge.net/ogdi.pdf
 # https://bugzilla.redhat.com/show_bug.cgi?id=1470896
 Patch0:         ogdi-3.2.0.beta2-sailer.patch
+# adapt to https://fedoraproject.org/wiki/Changes/SunRPCRemoval
+Patch1:         ogdi-3.2.0-rpc.patch
 
-BuildRequires:  unixODBC-devel zlib-devel
-BuildRequires:  expat-devel proj-devel tcl-devel
+BuildRequires:  gcc
+BuildRequires:  unixODBC-devel
+BuildRequires:  zlib-devel
+BuildRequires:  expat-devel
+BuildRequires:  proj-devel
+BuildRequires:  tcl-devel
+BuildRequires:  libtirpc-devel
 
 %description
 OGDI is the Open Geographic Datastore Interface. OGDI is an
@@ -56,6 +63,7 @@ TCL wrapper for OGDI.
 %prep
 %setup -q
 %patch0 -p0 -b .rhbz1470896
+%patch1 -p1 -b .rpc
 
 # include documentation
 cp -p %{SOURCE1} .
@@ -69,7 +77,7 @@ export CFG=debug # for -g
 # do not compile with ssp. it will trigger internal bugs (to_fix_upstream)
 OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
 export CFLAGS="$OPT_FLAGS -fPIC -DPIC -DDONT_TD_VOID -DUSE_TERMIO"
-%configure \
+%configure CPPFLAGS=-I/usr/include/tirpc \
         --with-binconfigs \
         --with-expat \
         --with-proj \
@@ -177,6 +185,9 @@ touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config
 
 
 %changelog
+* Thu Mar 15 2018 Dan Horák <dan[at]danny.cz> - 3.2.0-5
+- adapt to https://fedoraproject.org/wiki/Changes/SunRPCRemoval (#1556614)
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild