- fix building with json-c 0.13+

diff --git a/json-c-0.13.patch b/json-c-0.13.patch
new file mode 100644 (file)
index 0000000..5e55274
--- /dev/null
+++ b/json-c-0.13.patch
@@ -0,0 +1,10 @@
+--- postgis-2.2.1/liblwgeom/lwin_geojson.c~    2015-11-06 21:14:47.000000000 +0000
++++ postgis-2.2.1/liblwgeom/lwin_geojson.c     2018-05-11 05:07:55.774871737 +0000
+@@ -19,7 +19,6 @@
+ 
+ #ifdef HAVE_LIBJSON_C
+ #include <json-c/json.h>
+-#include <json-c/json_object_private.h>
+ #else
+ #include <json/json.h>
+ #include <json/json_object_private.h>

diff --git a/postgis.spec b/postgis.spec
index ead47f5a3e65f91b6d0ba112d233710eb42aa6d3..f02fb15be50bf33f58a19e3294ae7854aed45f68 100644 (file)
--- a/postgis.spec
+++ b/postgis.spec
@@ -17,6 +17,8 @@ Group:                Applications/Databases
 Source0:       http://download.osgeo.org/postgis/source/%{name}-%{version}%{subver}.tar.gz
 # Source0-md5: dc3575a0aac5a7e0bbddde17eb6be400
 Patch0:                %{name}-link.patch
+Patch1:                json-c-0.13.patch
+Patch2:                postgres10.patch
 URL:           http://postgis.refractions.net/
 %{?with_raster:BuildRequires:  gdal-devel >= 1.8.0}
 BuildRequires: geos-devel >= 3.5.0
@@ -114,8 +116,11 @@ Statyczna biblioteka lwgeom.
 %prep
 %setup -q -n %{name}-%{version}%{subver}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
+%{__autoconf}
 %configure \
        %{?with_gui:--with-gui} \
        %{!?with_raster:--without-raster}