From 1c6ed7b7baebf1e7f9717b4279f08d27f04a3458 Mon Sep 17 00:00:00 2001
From: Jakub Janco <jjanco@redhat.com>
Date: Tue, 25 Jun 2019 15:07:40 +0200
Subject: [PATCH] update to 42.2.6

---
 fix-parent-pom-version.patch | 12 ++++++++++++
 postgresql-jdbc.spec         | 11 ++++++++---
 sources                      |  4 ++--
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 fix-parent-pom-version.patch

diff --git a/fix-parent-pom-version.patch b/fix-parent-pom-version.patch
new file mode 100644
index 0000000..a5c8aac
--- /dev/null
+++ b/fix-parent-pom-version.patch
@@ -0,0 +1,12 @@
+diff -ru pgjdbc-REL42.2.6/pgjdbc/pom.xml pgjdbc-REL42.2.6-edit/pgjdbc/pom.xml
+--- pgjdbc-REL42.2.6/pgjdbc/pom.xml	2019-06-19 21:49:52.000000000 +0200
++++ pgjdbc-REL42.2.6-edit/pgjdbc/pom.xml	2019-06-25 13:46:05.912225119 +0200
+@@ -3,7 +3,7 @@
+   <parent>
+     <groupId>org.postgresql</groupId>
+     <artifactId>pgjdbc-core-parent</artifactId>
+-    <version>1.1.5</version>
++    <version>1.1.6</version>
+     <relativePath />
+   </parent>
+ 
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 8c73576..66ed855 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -46,7 +46,7 @@
 
 %global section		devel
 %global source_path	pgjdbc/src/main/java/org/postgresql
-%global parent_ver	1.1.5
+%global parent_ver	1.1.6
 %global parent_poms_builddir	./pgjdbc-parent-poms
 
 %global pgjdbc_mvn_options -DwaffleEnabled=false -DosgiEnabled=false \\\
@@ -54,8 +54,8 @@
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:	42.2.5
-Release:	2%{?dist}
+Version:	42.2.6
+Release:	1%{?dist}
 License:	BSD
 URL:		http://jdbc.postgresql.org/
 
@@ -70,6 +70,7 @@ Source1:	https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver/pgj
 # disable test that makes unpredictable assumptions about non-routable IPs
 # See https://github.com/pgjdbc/pgjdbc/issues/556
 Patch0:		disable-ConnectTimeoutTest.patch
+patch1:         fix-parent-pom-version.patch
 
 BuildArch:	noarch
 BuildRequires:	java-devel >= 1.8
@@ -114,6 +115,7 @@ mv pgjdbc-REL%version/* .
 mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms
 
 %patch0 -p1
+%patch1 -p1
 
 # remove any binary libs
 find -name "*.jar" -or -name "*.class" | xargs rm -f
@@ -190,6 +192,9 @@ opts="-f"
 
 
 %changelog
+* Tue Jun 25 2019 Jakub Janco <jjanco@redhat.com> - 42.2.6-1
+- new version
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 42.2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index eff9432..08f80ce 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (pgjdbc-REL42.2.5.tar.gz) = 4107df31c8c4574cae6df8e3229657b70909e844744e1f0c45989ba0871575c5b95adccbf45341e6bf3ebcb1df5010d35017535a58e054c8183d7e45267ede3e
-SHA512 (pgjdbc-parent-poms-REL1.1.5.tar.gz) = 924cfca194555e81174ccc8128810744ea7fe3b573e87353a0720e39e0846076dd115e40ad628c0b68fe46cf6993f402a2b01f07c71b580dddab2fd896cfa464
+SHA512 (pgjdbc-REL42.2.6.tar.gz) = 09979f1ffea4768afc3d688a0b19d2382853ada2cd68bd583a6ee4d17b39f486abf70c3073dd36367ab47f40476b37190e50dd47b0eee289d73891d3e70016cc
+SHA512 (pgjdbc-parent-poms-REL1.1.6.tar.gz) = 38e34a167744476568220e979bbc4139e43537f693e5e3e969ce58dc79d5b6361e92918d7f235ae9c00786b6997ad6bd98c6b680a6e59c5219da00b8b9b5760d