From 312fe8ff69a6984eaee7da794c79ff83a163756a Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 3 Mar 2020 10:09:34 +0100
Subject: [PATCH] Update to 6.3.1

---
 .gitignore |  1 +
 proj.spec  | 20 ++++++++++++++++----
 sources    |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index bcb2e44..e39c7fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /proj-5.2.0.tar.gz
 /proj-datumgrid-1.8.tar.gz
 /proj-6.2.0.tar.gz
+/proj-6.3.1.tar.gz
diff --git a/proj.spec b/proj.spec
index aa5a591..77c8d33 100644
--- a/proj.spec
+++ b/proj.spec
@@ -1,9 +1,18 @@
-%global proj_version 6.2.0
+%global proj_version 6.3.1
 %global datumgrid_version 1.8
 
+# The name is special so that rpmdev-bumpspec will bump this rather than adding .1 to the end
+%global baserelease 1
+
+# In order to avoid needing to keep incrementing the release version for the
+# main package forever, we will just construct one for npm that is guaranteed
+# to increment safely. Changing this can only be done during an update when the
+# base npm version number is increasing.
+%global datumgrid_release %{proj_version}.%{baserelease}
+
 Name:		proj
 Version:	%{proj_version}
-Release:	2%{?dist}
+Release:	%{baserelease}%{?dist}
 Summary:	Cartographic projection software (PROJ)
 
 License:	MIT
@@ -14,7 +23,7 @@ Source1:	https://download.osgeo.org/%{name}/%{name}-datumgrid-%{datumgrid_versio
 BuildRequires:	gcc-c++ sqlite-devel
 BuildRequires:	gtest-devel >= 1.8.0
 
-Requires:	proj-datumgrid = %{datumgrid_version}-%{release}
+Requires:	proj-datumgrid = %{datumgrid_version}-%{datumgrid_release}
 
 %description
 Proj and invproj perform respective forward and inverse transformation of
@@ -41,6 +50,7 @@ This package contains libproj static library.
 %package datumgrid
 Summary:	Additional datum shift grids for PROJ
 Version:	%{datumgrid_version}
+Release:        %{datumgrid_release}
 # See README.DATUMGRID
 License:	CC-BY and Freely Distributable and Ouverte and Public Domain
 BuildArch:	noarch
@@ -117,7 +127,6 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
 %{_mandir}/man3/*.3*
 %{_includedir}/*.h
 %{_includedir}/proj/
-%{_includedir}/proj_json_streaming_writer.hpp
 %{_datadir}/proj/projjson.schema.json
 %{_libdir}/libproj.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -134,6 +143,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
 
 
 %changelog
+* Wed Feb 19 2020 Sandro Mani <manisandro@gmail.com> - 6.3.1-1
+- Update to 6.3.1
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index ea7f0f1..9560d48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (proj-datumgrid-1.8.tar.gz) = 23153f5b57d210e37cd6e9e0fced23bdabb1c67476e9fb50eb83a68ae066a5c3675822472f5d558d10ddf36ac1d73d538b75304d112a1bfcd8d0bbd26c6481a5
-SHA512 (proj-6.2.0.tar.gz) = 4c2fd898103c8955a48557353c6866723d6e6b3769580d0b9cb63a685cf4e53ebe63b965498c2ba03eac4827a68fd0036a2234364a7d92dc28e5cdaecf90142d
+SHA512 (proj-6.3.1.tar.gz) = 669b752f491bd99e320b0750c7129251a562a303e008e3d89c8e71baefd7f6d4ccb08234b3039c03694e2cc93b8dde81771cd7ffd981ff8045d855240a480a5e