- updated to 3.2.0 final

- additional fix for #1470896

.gitignore

@@ -1,2 +1,3 @@
 ogdi-3.2.0.beta2.tar.gz
 ogdi.pdf
+/ogdi-3.2.0.tar.gz

ogdi-3.2.0.beta2-projfix.patch

@@ -1,70 +0,0 @@
-diff -up ogdi-3.2.0.beta2/ogdi/datum_driver/usa/dtusa.c.projfix ogdi-3.2.0.beta2/ogdi/datum_driver/usa/dtusa.c
---- ogdi-3.2.0.beta2/ogdi/datum_driver/usa/dtusa.c.projfix	2012-08-19 21:27:41.632952279 -0500
-+++ ogdi-3.2.0.beta2/ogdi/datum_driver/usa/dtusa.c	2012-08-19 21:27:47.343951832 -0500
-@@ -124,7 +124,7 @@ int dyn_nad_init(privdata, table)
-     strcat(pathfile,"/");  
-     strcat(pathfile,table);  
- 
--    ptr->dtptr = nad_init(pathfile);
-+    ptr->dtptr = nad_init(pj_get_default_ctx(), pathfile);
-     if (ptr->dtptr == NULL) {
-       ptr->count--;
-       return FALSE;
-diff -up ogdi-3.2.0.beta2/proj/nad2nad.c.projfix ogdi-3.2.0.beta2/proj/nad2nad.c
---- ogdi-3.2.0.beta2/proj/nad2nad.c.projfix	2012-08-19 21:28:18.943950482 -0500
-+++ ogdi-3.2.0.beta2/proj/nad2nad.c	2012-08-19 21:29:06.057949242 -0500
-@@ -74,7 +74,7 @@ set_zone(int in, struct IO_CON *io) {
- 
- 	if (io->hp) {
- 		io->t83 = 1;
--		if (!(htab = nad_init(io->hp)))
-+		if (!(htab = nad_init(pj_get_default_ctx(), io->hp)))
- 			emess(1,"hp datum file: %s, failed: %s", io->hp,
- 				pj_strerrno(pj_errno));
- 	}
-@@ -109,7 +109,7 @@ setup() {
- 	if (czone) {
- 		if (!input.hp && !output.hp && input.t83 == output.t83)
- 			emess(1,"identical datums");
--		if (!(ctab = nad_init(czone)))
-+		if (!(ctab = nad_init(pj_get_default_ctx(), czone)))
- 			emess(1,"datum file: %s, failed: %s", czone, pj_strerrno(pj_errno));
- 	} else if (input.t83 != output.t83)
- 		emess(1,"conversion region (-r) not specified");
-diff -up ogdi-3.2.0.beta2/proj/nad_init.c.projfix ogdi-3.2.0.beta2/proj/nad_init.c
---- ogdi-3.2.0.beta2/proj/nad_init.c.projfix	2012-08-19 21:29:27.827948522 -0500
-+++ ogdi-3.2.0.beta2/proj/nad_init.c	2012-08-19 21:32:24.578942144 -0500
-@@ -8,18 +8,17 @@ static const char SCCSID[]="@(#)nad_init
- #include <errno.h>
- extern FILE *pj_open_lib(char *, char *);
- 	struct CTABLE *
--nad_init(char *name) {
-+nad_init(projCtx ctx, char *name) {
- 	char fname[FILENAME_MAX+1];
- 	struct CTABLE *ct;
- 	FILE *fid;
- 	size_t i;
- 
--	errno = pj_errno = 0;
-+	ctx->last_errno = 0;
- 	if (!(fid = pj_open_lib(name, "rb"))) {
- 	  strcpy(fname, "nad2783/");
- 	  strcat(fname, name);
--	  if (!(fid = pj_open_lib(fname, "rb"))) {
--	    pj_errno = errno;
-+	  if (!(fid = pj_open_lib(ctx, fname, "rb"))) { 
- 	    return 0;
- 	  }
- 	}
-diff -up ogdi-3.2.0.beta2/proj/projects.h.projfix ogdi-3.2.0.beta2/proj/projects.h
---- ogdi-3.2.0.beta2/proj/projects.h.projfix	2012-08-19 21:32:44.054941484 -0500
-+++ ogdi-3.2.0.beta2/proj/projects.h	2012-08-19 21:33:22.313939807 -0500
-@@ -210,7 +210,7 @@ int bch2bps(UV a, UV b, UV **, int, int)
- /* nadcon related protos */
- LP nad_interp(LP, struct CTABLE *);
- LP nad_cvt(LP, int, struct CTABLE *);
--struct CTABLE *nad_init(char *);
-+struct CTABLE *nad_init(projCtx ctx, char *);
- void nad_free(struct CTABLE *);
- 
- #endif /* end of basic projections header */

ogdi.spec

@@ -1,13 +1,14 @@
 Name:           ogdi
 Version:        3.2.0
-Release:        0.28.beta2%{?dist}
+Release:        1%{?dist}
 Summary:        Open Geographic Datastore Interface
 Group:          Applications/Engineering
 License:        BSD
 URL:            http://ogdi.sourceforge.net/
-Source0:        http://dl.sourceforge.net/ogdi/%{name}-%{version}.beta2.tar.gz
+Source0:        http://dl.sourceforge.net/ogdi/%{name}-%{version}.tar.gz
 Source1:        http://ogdi.sourceforge.net/ogdi.pdf
-Patch0:         ogdi-3.2.0.beta2-projfix.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1470896
+Patch0:         ogdi-3.2.0.beta2-sailer.patch
 
 BuildRequires:  unixODBC-devel zlib-devel
 BuildRequires:  expat-devel proj-devel tcl-devel
@@ -53,8 +54,8 @@ TCL wrapper for OGDI.
 
 
 %prep
-%setup -q -n %{name}-%{version}.beta2
+%setup -q
-%patch0 -p1 -b .projfix
+%patch0 -p0 -b .rhbz1470896
 
 # include documentation
 cp -p %{SOURCE1} .
@@ -176,6 +177,10 @@ touch -r ogdi-config.in %{buildroot}%{_bindir}/%{name}-config
 
 
 %changelog
+* Mon Jul 17 2017 Dan Horák <dan[at]danny.cz> - 3.2.0-1
+- updated to 3.2.0 final
+- additional fix for #1470896
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-0.28.beta2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1,2 +1 @@
-8efc8f1e1dc77bfeda431d9b8e08d871  ogdi-3.2.0.beta2.tar.gz
+SHA512 (ogdi-3.2.0.tar.gz) = b29d52b733c15927d2c93df10632d9bf6288614b944c02a5e1a67f3f971263bcb07460b301fb5db389ed15fc5f38a1f3c0263c4b1441f2ea4809bb61b3e67ef0
-029a8cdcd36bee73df92196ee769040e  ogdi.pdf