- fix building with json-c 0.12+

- rel 3

diff --git a/json-c-0.12.patch b/json-c-0.12.patch
new file mode 100644 (file)
index 0000000..64a30dd
--- /dev/null
+++ b/json-c-0.12.patch
@@ -0,0 +1,13 @@
+--- postgis-2.1.3/liblwgeom/lwin_geojson.c~    2014-04-03 23:53:20.000000000 +0200
++++ postgis-2.1.3/liblwgeom/lwin_geojson.c     2014-11-24 00:33:07.024233277 +0100
+@@ -17,8 +17,8 @@
+ 
+ #ifdef HAVE_LIBJSON
+ 
+-#include <json/json.h>
+-#include <json/json_object_private.h>
++#include <json-c/json.h>
++#include <json-c/json_object_private.h>
+ #include <string.h>
+ 
+ static void geojson_lwerror(char *msg, int error_code)

diff --git a/postgis.spec b/postgis.spec
index 43779ca13358773dd5f4e3ccdc92c3efbe32b834..123ac0b06856ec89718e7ad72969c4c072f563ce 100644 (file)
--- a/postgis.spec
+++ b/postgis.spec
@@ -10,13 +10,15 @@ Summary:    Geographic Information Systems Extensions to PostgreSQL
 Summary(pl.UTF-8):     Rozszerzenie do PostgreSQL wspomagające Geograficzne Systemy Informacyjne
 Name:          postgis
 Version:       2.1.3
-Release:       2
+Release:       3
 License:       GPL v2+
 Group:         Applications/Databases
 Source0:       http://download.osgeo.org/postgis/source/%{name}-%{version}%{beta}.tar.gz
 # Source0-md5: 104e4468429ea0882259fc268c62d6c7
+Patch0:                json-c-0.12.patch
 URL:           http://postgis.refractions.net/
 %{?with_raster:BuildRequires:  gdal-devel >= 1.6.0}
+BuildRequires: gdal-devel
 BuildRequires: geos-devel >= 3.3.2
 BuildRequires: json-c-devel
 BuildRequires: libstdc++-devel
@@ -108,6 +110,7 @@ Statyczna biblioteka lwgeom.
 
 %prep
 %setup -q -n %{name}-%{version}%{beta}
+%patch0 -p1
 
 %build
 %configure \