commit 404c1b75ffff0876863b7efadebac7579a169074
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Tue Nov 25 09:29:34 2014 +0100
- up to 2.1.4; fixed undefined symbol in liblwgeom
json-c-0.12.patch | 22 ----------------------
postgis.spec | 8 +++-----
2 files changed, 3 insertions(+), 27 deletions(-)
---
diff --git a/postgis.spec b/postgis.spec
index 3f79403..b28c5f3 100644
--- a/postgis.spec
+++ b/postgis.spec
@@ -9,13 +9,12 @@
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: 4
+Version: 2.1.4
+Release: 1
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
+# Source0-md5: 6f7bacc0205859dafdfe545db1b892ca
URL: http://postgis.refractions.net/
%{?with_raster:BuildRequires: gdal-devel >= 1.6.0}
BuildRequires: gdal-devel
@@ -110,7 +109,6 @@ Statyczna biblioteka lwgeom.
%prep
%setup -q -n %{name}-%{version}%{beta}
-%patch0 -p1
%build
%configure \
diff --git a/json-c-0.12.patch b/json-c-0.12.patch
deleted file mode 100644
index 64b6cc8..0000000
--- a/json-c-0.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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)
-@@ -510,7 +510,7 @@
- if( jstok->err != json_tokener_success)
- {
- char err[256];
-- snprintf(err, 256, "%s (at offset %d)",
json_tokener_errors[jstok->err], jstok->char_offset);
-+ snprintf(err, 256, "%s (at offset %d)",
json_tokener_error_desc(jstok->err), jstok->char_offset);
- json_tokener_free(jstok);
- json_object_put(poObj);
- geojson_lwerror(err, 1);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postgis.git/commitdiff/404c1b75ffff0876863b7efadebac7579a169074
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
