diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..72e3eef --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +SOURCES/pgjdbc-REL42.2.3.tar.gz +SOURCES/pgjdbc-parent-poms-REL1.1.5.tar.gz diff --git a/.postgresql-jdbc.metadata b/.postgresql-jdbc.metadata new file mode 100644 index 0000000..7b14bd1 --- /dev/null +++ b/.postgresql-jdbc.metadata @@ -0,0 +1,2 @@ +93681c950f1eccde132594ed6b63cce893bb7641 SOURCES/pgjdbc-REL42.2.3.tar.gz +7f8778fa0976d7991e8aaba887253ec204382477 SOURCES/pgjdbc-parent-poms-REL1.1.5.tar.gz diff --git a/SOURCES/disable-ConnectTimeoutTest.patch b/SOURCES/disable-ConnectTimeoutTest.patch new file mode 100644 index 0000000..420d6ab --- /dev/null +++ b/SOURCES/disable-ConnectTimeoutTest.patch @@ -0,0 +1,13 @@ +diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java +index 188183a..c0e4cca 100644 +--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java ++++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java +@@ -104,7 +104,7 @@ import org.junit.runners.Suite; + LoginTimeoutTest.class, + TestACL.class, + +- ConnectTimeoutTest.class, ++ // ConnectTimeoutTest.class, + + PGPropertyTest.class, + diff --git a/SPECS/postgresql-jdbc.spec b/SPECS/postgresql-jdbc.spec new file mode 100644 index 0000000..3fbdf2f --- /dev/null +++ b/SPECS/postgresql-jdbc.spec @@ -0,0 +1,388 @@ +# Copyright (c) 2000-2005, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +# Configuration for rpmbuild, might be specified by options +# like e.g. 'rpmbuild --define "runselftest 0"'. + +%{!?runselftest:%global runselftest 1} + + +%global section devel +%global source_path pgjdbc/src/main/java/org/postgresql +%global parent_ver 1.1.5 +%global parent_poms_builddir ./pgjdbc-parent-poms + +%global pgjdbc_mvn_options -DwaffleEnabled=false -DosgiEnabled=false \\\ + -DexcludePackageNames=org.postgresql.osgi:org.postgresql.sspi + +Summary: JDBC driver for PostgreSQL +Name: postgresql-jdbc +Version: 42.2.3 +Release: 1%{?dist} +License: BSD +URL: http://jdbc.postgresql.org/ + +Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%{version}/pgjdbc-REL%{version}.tar.gz +Provides: pgjdbc = %version-%release + +# 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/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 +Patch0: disable-ConnectTimeoutTest.patch + +BuildArch: noarch +BuildRequires: java-devel >= 1.8 +BuildRequires: maven-local +BuildRequires: java-comment-preprocessor +BuildRequires: properties-maven-plugin +BuildRequires: maven-enforcer-plugin +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-test-rpm-macros +%endif + +# gettext is only needed if we try to update translations +#BuildRequires: gettext + +Obsoletes: %{name}-parent-poms < 42.2.2-2 + +%description +PostgreSQL is an advanced Object-Relational database management +system. The postgresql-jdbc package includes the .jar files needed for +Java programs to access a PostgreSQL database. + + +%package javadoc +Summary: API docs for %{name} + +%description javadoc +This package contains the API Documentation for %{name}. + + +%prep +%setup -c -q -a 1 + +mv pgjdbc-REL%version/* . +mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms + +%patch0 -p1 + +# remove any binary libs +find -name "*.jar" -or -name "*.class" | xargs rm -f + +# Build parent POMs in the same Maven call. +%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. +%mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql + +# Parent POMs should not be installed. +%mvn_package ":*{parent,versions,prevjre}*" __noinstall + +# For compat reasons, make Maven artifact available under older coordinates. +%mvn_alias org.postgresql:postgresql postgresql:postgresql + +# Hack #1! This directory is missing for some reason, it is most probably some +# misunderstanding between maven, maven-compiler-plugin and +# java-comment-preprocessor? Not solved yet. See rhbz#1325060. +mkdir -p pgjdbc/target/generated-sources/annotations + + +%build +# Ideally we would run "sh update-translations.sh" here, but that results +# in inserting the build timestamp into the generated messages_*.class +# files, which makes rpmdiff complain about multilib conflicts if the +# different platforms don't build in the same minute. For now, rely on +# upstream to have updated the translations files before packaging. + +# Include PostgreSQL testing methods and variables. +%if %runselftest +%postgresql_tests_init + +PGTESTS_LOCALE=C.UTF-8 + +cat < build.local.properties +server=localhost +port=$PGTESTS_PORT +database=test +username=test +password=test +privilegedUser=$PGTESTS_ADMIN +privilegedPassword=$PGTESTS_ADMINPASS +preparethreshold=5 +loglevel=0 +protocolVersion=0 +EOF + +# Start the local PG cluster. +%postgresql_tests_start +%else +# -f is equal to -Dmaven.test.skip=true +opts="-f" +%endif + +%mvn_build $opts -- %pgjdbc_mvn_options + + +%install +%mvn_install + + +%files -f .mfiles +%license LICENSE +%doc README.md + + +%files javadoc -f .mfiles-javadoc +%license LICENSE + + +%changelog +* Fri Jul 13 2018 Pavel Raiskup - 42.2.3-1 +- new upstream release (rhbz#1600759) + +* Wed May 30 2018 Mikolaj Izdebski - 42.2.2-2 +- Remove and obsolete parent-poms subpackage + +* Fri Apr 20 2018 Pavel Raiskup - 42.2.2-2 +- provide postgresql.jar, as that's the upstream's artifactId + +* Fri Apr 13 2018 Pavel Raiskup - 42.2.2-1 +- rebase to latest upstream release + +* Fri Apr 13 2018 Pavel Raiskup - 42.2.0-1 +- rebase to the latest upstream release +- nicer github source urls +- sync with upstream spec +- use new postgresql testing macros (rawhide only) +- depend on postgresql-test-rpm-macros + +* Wed Aug 23 2017 Pavel Raiskup - 42.1.4-1 +- rebase to latest upstream release + +* Thu Jul 27 2017 Fedora Release Engineering - 9.4.1212-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 9.4.1212-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 22 2016 Pavel Raiskup - 9.4.1212-2 +- Disable unpredictable test to fix FTBFS (BZ#1406931), + patch by Merlin Mathesius + +* Thu Nov 03 2016 Pavel Raiskup - 9.4.1212-1 +- new release, rhbz#1377317, per announcement: + https://www.postgresql.org/message-id/CAB=Je-FjbvQ_MmAGmhZ-1sSMnodpjr9Uz6Q=faxqCxOvpRO-UQ@mail.gmail.com + +* Tue Oct 04 2016 Pavel Raiskup - 9.4.1210-2 +- depend on test macros from postgresql-setup + +* Thu Sep 08 2016 Pavel Raiskup - 9.4.1210-1 +- new release, rhbz#1374106, per announcement: + https://www.postgresql.org/message-id/CAB=Je-FzuqwDXLTT62VfzvTUhR4QTfLjmw2D5QfgaykDkhW7nw@mail.gmail.com + +* Mon Aug 29 2016 Pavel Raiskup - 9.4.1209-6 +- fix License, pgjdbc is BSD only + +* Thu Jul 21 2016 gil cattaneo 9.4.1209-5 +- fix postgresql-jdbc.jar symlink using javapackages macros +- adapt to current guideline +- install doc and license file in parent-poms sub package +- simplified runselftest check + +* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-4 +- restore one compat symlink + +* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-3 +- bump: for Mikolaj's fixes + +* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-2 +- update to latest release version, thanks to Pavel Kajaba, Michael Simacek and + Vladimir Sitnikov for big help +- fix Provides, remove old compatibility hacks + +* Thu Feb 04 2016 Fedora Release Engineering - 9.4.1200-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 9.4.1200-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 04 2015 Pavel Raiskup - 9.4.1200-1 +- rebase to most recent version (#1188827) + +* Mon Jul 14 2014 Pavel Raiskup - 9.3.1102-1 +- Rebase to most recent version (#1118667) +- revert back upstream commit for travis build + +* Sat Jun 07 2014 Fedora Release Engineering - 9.3.1101-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 19 2014 Pavel Raiskup - 9.3.1101-3 +- run upstream testsuite when '%%runselftest' defined + +* Wed Apr 23 2014 Mikolaj Izdebski - 9.3.1101-2 +- Add explicit requires on java-headless + +* Wed Apr 23 2014 Pavel Raiskup - 9.3.1101-1 +- Rebase to most recent version (#1090366) + +* Fri Mar 28 2014 Michael Simacek - 9.2.1002-5 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Aug 06 2013 Pavel Raiskup - 9.2.1002-4 +- add javadoc subpackage + +* Tue Aug 06 2013 Pavel Raiskup - 9.2.1002-4 +- don't use removed macro %%add_to_maven_depmap (#992816) +- lint: trim-lines, reuse %%{name} macro, fedora-review fixes +- merge cleanup changes by Stano Ochotnicky + +* Sun Aug 04 2013 Fedora Release Engineering - 9.2.1002-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 9.2.1002-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 14 2012 Tom Lane 9.2.1002-1 +- Update to build 9.2-1002 (just to correct mispackaging of source tarball) + +* Tue Nov 13 2012 Tom Lane 9.2.1001-1 +- Update to build 9.2-1001 for compatibility with PostgreSQL 9.2 + +* Sun Jul 22 2012 Tom Lane 9.1.902-1 +- Update to build 9.1-902 + +* Sat Jul 21 2012 Fedora Release Engineering - 9.1.901-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Feb 23 2012 Tom Lane 9.1.901-3 +- Change BuildRequires: java-1.6.0-openjdk-devel to just java-devel. + As of 9.1-901, upstream has support for JDBC4.1, so we don't have to + restrict to JDK6 anymore, and Fedora is moving to JDK7 +Resolves: #796580 + +* Sat Jan 14 2012 Fedora Release Engineering - 9.1.901-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Sep 12 2011 Tom Lane 9.1.901-1 +- Update to build 9.1-901 for compatibility with PostgreSQL 9.1 + +* Mon Aug 15 2011 Tom Lane 9.0.801-4 +- Add BuildRequires: java-1.6.0-openjdk-devel to ensure we have recent JDK +Related: #730588 +- Remove long-obsolete minimum versions from BuildRequires + +* Sun Jul 17 2011 Tom Lane 9.0.801-3 +- Switch to non-GCJ build, since GCJ is now deprecated in Fedora +Resolves: #722247 +- Use %%{_mavendepmapfragdir} to fix FTBFS with maven 3 + +* Wed Feb 09 2011 Fedora Release Engineering - 9.0.801-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 29 2010 Tom Lane 9.0.801-1 +- Update to build 9.0-801 + +* Mon May 31 2010 Tom Lane 8.4.701-4 +- Update gcj_support sections to meet Packaging/GCJGuidelines; + fixes FTBFS in F-14 rawhide + +* Tue Nov 24 2009 Tom Lane 8.4.701-3 +- Seems the .pom file *must* have a package version number in it, sigh +Resolves: #538487 + +* Mon Nov 23 2009 Tom Lane 8.4.701-2 +- Add a .pom file to ease use by maven-based packages (courtesy Deepak Bhole) +Resolves: #538487 + +* Tue Aug 18 2009 Tom Lane 8.4.701-1 +- Update to build 8.4-701 + +* Sun Jul 26 2009 Fedora Release Engineering - 0:8.3.603-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Apr 21 2009 Tom Lane 8.3.603-3 +- Avoid multilib conflict caused by overeager attempt to rebuild translations + +* Thu Feb 26 2009 Fedora Release Engineering - 0:8.3.603-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway 8.3.603-1.1 +- drop repotag + +* Tue Feb 12 2008 Tom Lane 8.3.603-1jpp +- Update to build 8.3-603 + +* Sun Aug 12 2007 Tom Lane 8.2.506-1jpp +- Update to build 8.2-506 + +* Tue Apr 24 2007 Tom Lane 8.2.505-1jpp +- Update to build 8.2-505 +- Work around 1.4 vs 1.5 versioning inconsistency + +* Fri Dec 15 2006 Tom Lane 8.2.504-1jpp +- Update to build 8.2-504 + +* Wed Aug 16 2006 Tom Lane 8.1.407-1jpp.4 +- Fix Requires: for rebuild-gcj-db (bz #202544) + +* Wed Aug 16 2006 Fernando Nasser 8.1.407-1jpp.3 +- Merge with upstream + +* Sat Jul 22 2006 Jakub Jelinek 8.1.407-1jpp.2 +- Rebuilt + +* Wed Jul 12 2006 Jesse Keating - 0:8.1.407-1jpp.1 +- rebuild + +* Wed Jun 14 2006 Tom Lane 8.1.407-1jpp +- Update to build 8.1-407 + +* Mon Mar 27 2006 Tom Lane 8.1.405-2jpp +- Back-patch upstream fix to support unspecified-type strings. + +* Thu Feb 16 2006 Tom Lane 8.1.405-1jpp +- Split postgresql-jdbc into its own SRPM (at last). +- Build it from source. Add support for gcj compilation.