From 83f08dacd1e3540feec9e1fc2005010f3f8ce727 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 19 Jan 2018 10:07:44 +0100 Subject: [PATCH] rebase: new upstream release Per changelog: https://jdbc.postgresql.org/documentation/changelog.html#version_42.2.0 Resolves: rhbz#1536251 Version: 42.2.0-1 --- .gitignore | 4 ++-- postgresql-jdbc.spec | 19 ++++++++++++++----- sources | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 4c4281f..b5fb24b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/REL42.1.4.tar.gz -/REL1.1.2.tar.gz +/pgjdbc-REL42.2.0.tar.gz +/pgjdbc-parent-poms-REL1.1.3.tar.gz diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index e04f515..e15c16c 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -36,7 +36,7 @@ %global section devel %global source_path pgjdbc/src/main/java/org/postgresql -%global parent_ver 1.1.2 +%global parent_ver 1.1.3 %global parent_poms_builddir ./pgjdbc-parent-poms %global pgjdbc_mvn_options -DwaffleEnabled=false -DosgiEnabled=false \\\ @@ -44,17 +44,17 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc -Version: 42.1.4 +Version: 42.2.0 Release: 1%{?dist} License: BSD URL: http://jdbc.postgresql.org/ -Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%version.tar.gz +Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%{version}/pgjdbc-REL%{version}.tar.gz # Upstream moved parent pom.xml into separate project (even though there is only # one dependant project on it?). Let's try to not complicate packaging by # having separate spec file for it, too. -Source1: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver.tar.gz +Source1: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver/pgjdbc-parent-poms-REL%{parent_ver}.tar.gz # disable test that makes unpredictable assumptions about non-routable IPs # See https://github.com/pgjdbc/pgjdbc/issues/556 @@ -70,6 +70,9 @@ BuildRequires: maven-plugin-bundle BuildRequires: maven-plugin-build-helper BuildRequires: classloader-leak-test-framework +BuildRequires: mvn(com.ongres.scram:client) +BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin) + %if %runselftest BuildRequires: postgresql-contrib BuildRequires: postgresql-devel @@ -101,7 +104,7 @@ This package contains the API Documentation for %{name}. %prep -%setup -c -q -a 1 -n pgjdbc-REL%version +%setup -c -q -a 1 mv pgjdbc-REL%version/* . mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms @@ -117,6 +120,7 @@ find -name "*.jar" -or -name "*.class" | xargs rm -f %pom_xpath_inject pom:modules "%parent_poms_builddir" %pom_xpath_inject pom:parent "pgjdbc-parent-poms/pgjdbc-versions" %pom_xpath_set pom:relativePath ../pgjdbc-parent-poms/pgjdbc-core-parent pgjdbc +%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" pgjdbc # compat symlink: requested by dtardon (libreoffice), reverts part of # 0af97ce32de877 commit. @@ -189,6 +193,11 @@ opts="-f" %changelog +* Fri Jan 19 2018 Pavel Raiskup - 42.2.0-1 +- rebase to the latest upstream release +- nicer github source urls +- sync with upstream spec + * Wed Aug 23 2017 Pavel Raiskup - 42.1.4-1 - rebase to latest upstream release diff --git a/sources b/sources index 3907270..3c9edc4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (REL42.1.4.tar.gz) = 5f3095c4df384d313a73425455c8cba3be4fe00c662b75da6b100106fcc4e41dad2edd4e14f6c801c86c503300606fc50bb4d2858c2d5d2f4d3e65fbeae55c59 -SHA512 (REL1.1.2.tar.gz) = e4dc7ac830ba0abca17b246cb3a031d0d4473e1f55545f1a42360a84ec2e05db4d0c80ac9b6f8ed9272f7a213708cce7a11f6f1ab0ada539ff2f1e61b1fbf6c9 +SHA512 (pgjdbc-REL42.2.0.tar.gz) = 0d0400d73ace1ca4d33d1c6422e946d02aea039e0475e12979fb8651e53deef5a7b025158acdde8031b0a06790b169d358ee3f8b2ba855d955d1c0d7ba8b7004 +SHA512 (pgjdbc-parent-poms-REL1.1.3.tar.gz) = 55fa8c8ee74b6b66972d52478b55b61a587903c240cd461e7d16fa8d838e4f25d6e782c1302b7daa57f44d7be71d93bcb2361c6d8e1a873ef395a96dc3e8ea58