diff --git a/postgresql-jdbc-8.4.701-bogus-import.patch b/postgresql-jdbc-8.4.701-bogus-import.patch
deleted file mode 100644
index 1ac2a8f..0000000
--- a/postgresql-jdbc-8.4.701-bogus-import.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- org/postgresql/gss/MakeGSS.java 2008-11-29 08:43:47.000000000 +0100
-+++ org/postgresql/gss/MakeGSS.java-gil 2010-01-20 13:36:10.000000000 +0100
-@@ -18,7 +18,6 @@
- import java.io.IOException;
- import java.sql.SQLException;
-
--import com.sun.security.auth.callback.TextCallbackHandler;
- import org.postgresql.core.PGStream;
- import org.postgresql.core.Logger;
- import org.postgresql.util.*;
diff --git a/postgresql-jdbc.pom b/postgresql-jdbc.pom
deleted file mode 100644
index 97df9de..0000000
--- a/postgresql-jdbc.pom
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- 4.0.0
- postgresql
- postgresql
- jar
- PostgreSQL JDBC Driver
-
- @POSTGRESQL_JDBC_VERSION@
- http://jdbc.postgresql.org
- The PostgreSQL Driver JDBC4
-
-
- BSD License
- http://jdbc.postgresql.org/license.html
-
- repo
-
-
-
- http://gborg.postgresql.org/project/pgjdbc/cvs/cvs.php
-
-
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 38a9a53..64bd30e 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -2,144 +2,77 @@
%define MINOR %(echo %version | cut -d. -f 3-)
%define javahome %{_jvmdir}/jdk
Name: postgresql-jdbc
-Version: 8.4.701
-Release: 3mamba
+Version: 42.2.18
+Release: 1mamba
Summary: PostgreSQL JDBC Driver
Group: Applications/Databases
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco
-URL: http://jdbc.postgresql.org/
-Source0: http://jdbc.postgresql.org/download/postgresql-jdbc-%{MAJOR}-%{MINOR}.src.tar.gz
-Source1: postgresql-jdbc.pom
-Patch0: postgresql-jdbc-8.4.701-bogus-import.patch
+URL: https://jdbc.postgresql.org
+Source0: https://search.maven.org/remotecontent?filepath=org/postgresql/postgresql/%{version}.jre6/postgresql-%{version}.jre6.jar
+Source1: https://search.maven.org/remotecontent?filepath=org/postgresql/postgresql/%{version}.jre7/postgresql-%{version}.jre7.jar
+Source2: https://search.maven.org/remotecontent?filepath=org/postgresql/postgresql/%{version}/postgresql-%{version}.jar
+Source3: postgresql-jdpc-LICENSE
License: BSD
-BuildRequires: apache-ant
-BuildRequires: apache-ant-junit
-BuildRequires: apache-ant-nodeps
-BuildRequires: apache-ant-trax
-BuildRequires: docbook-xsl
-BuildRequires: findutils
-BuildRequires: gettext
-BuildRequires: java-junit3
-#BuildRequires: java-gcj-compat
-BuildRequires: jpackage-utils
-BuildRequires: xalan-j2
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+## AUTOBUILDREQ-BEGIN
+## AUTOBUILDREQ-END
+BuildRequires: javapackages
+Requires: javapackages
%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
-Group: Documentation
-Summary: Javadoc for %{name}
-
-%description javadoc
-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
-
-This package contains javadoc for %{name}.
-
-%package manual
-Group: Documentation
-Summary: Manual for %{name}
-
-%description manual
-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
-
-This package contains manual for %{name}.
-
%prep
-%setup -q -c -n %{name}-%{version}
-mv -f %{name}-%{MAJOR}-%{MINOR}.src/* .
-rm -f %{name}-%{MAJOR}-%{MINOR}.src/.cvsignore
-rmdir %{name}-%{MAJOR}-%{MINOR}.src
-
-for j in $(find . -name "*.jar"); do
- mv $j ${j}.no
-done
-
-for j in $(find . -name "*.class"); do
- rm -rf $j
-done
-
-%patch0
+%setup -q -c
+cp %{SOURCE3} LICENSE
%build
-export JAVA_HOME=%javahome
-export CLASSPATH=$(build-classpath junit-3.8.2 ant/ant-junit)
-sh update-translations.sh
-ant jar runtest publicapi privateapi
-
-export CLASSPATH=$CLASSPATH:$(build-classpath xalan-j2 xalan-j2-serializer ant/ant-trax ant/ant-nodeps)
-ant \
- -Ddocbook.stylesheet=%{_datadir}/sgml/docbook/xsl-stylesheets/html/chunk.xsl \
- -Ddocbook.xsl=%{_datadir}/sgml/docbook/xsl-stylesheets \
- doc
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-mkdir -p %{buildroot}%{_javadir}
+install -D -m0755 %{SOURCE0} %{buildroot}%{_javadir}/postgresql-jdbc-%{version}.jdbc4.jar
+install -D -m0755 %{SOURCE1} %{buildroot}%{_javadir}/postgresql-jdbc-%{version}.jdbc41.jar
+install -D -m0755 %{SOURCE2} %{buildroot}%{_javadir}/postgresql-jdbc-%{version}.jdbc42.jar
-install -m 644 jars/postgresql.jar \
- %{buildroot}%{_javadir}/postgresql-jdbc-%{version}.jar
-install -m 644 jars/postgresql-tests.jar \
- %{buildroot}%{_javadir}/postgresql-tests-%{version}.jar
+ln -s postgresql-jdbc-%{version}.jdbc4.jar %{buildroot}%{_javadir}/postgresql-jdbc4.jar
+ln -s postgresql-jdbc-%{version}.jdbc41.jar %{buildroot}%{_javadir}/postgresql-jdbc41.jar
+ln -s postgresql-jdbc-%{version}.jdbc42.jar %{buildroot}%{_javadir}/postgresql-jdbc42.jar
-mkdir -p %{buildroot}%{_datadir}/maven2/poms
-cp %{SOURCE1} JPP-postgresql-jdbc.pom
-sed -i "s|@POSTGRESQL_JDBC_VERSION@|%{MAJOR}-%{MINOR}|" JPP-postgresql-jdbc.pom
-install -m 644 JPP-postgresql-jdbc.pom %{buildroot}%{_datadir}/maven2/poms/JPP-postgresql-jdbc.pom
-%add_to_maven_depmap postgresql postgresql %{version} JPP postgresql-jdbc
-
-pushd %{buildroot}%{_javadir}
- ln -s postgresql-jdbc-%{version}.jar postgresql-jdbc.jar
- ln -s postgresql-tests-%{version}.jar postgresql-tests.jar
- ln -s postgresql-jdbc-%{version}.jar postgresql-jdbc2.jar
- ln -s postgresql-jdbc-%{version}.jar postgresql-jdbc2ee.jar
- ln -s postgresql-jdbc-%{version}.jar postgresql-jdbc3.jar
- ln -s postgresql-jdbc-%{version}.jar postgresql-jdbc4.jar
-popd
-
-mkdir -p %{buildroot}%{_javadocdir}/postgresql-jdbc-%{version}/publicapi
-cp -pr build/publicapi/* %{buildroot}%{_javadocdir}/postgresql-jdbc-%{version}/publicapi
-mkdir -p %{buildroot}%{_javadocdir}/postgresql-jdbc-%{version}/privateapi
-cp -pr build/privateapi/* %{buildroot}%{_javadocdir}/postgresql-jdbc-%{version}/privateapi
-ln -sf postgresql-jdbc-%{version} %{buildroot}%{_javadocdir}/postgresql-jdbc
+ln -s postgresql-jdbc-%{version}.jdbc4.jar %{buildroot}%{_javadir}/postgresql-%{version}.jre6.jar
+ln -s postgresql-jdbc-%{version}.jdbc41.jar %{buildroot}%{_javadir}/postgresql-%{version}.jre7.jar
+ln -s postgresql-jdbc-%{version}.jdbc42.jar %{buildroot}%{_javadir}/postgresql-%{version}.jar
+
+ln -s postgresql-%{version}.jar %{buildroot}%{_javadir}/postgresql-jdbc.jar
+ln -s postgresql-%{version}.jar %{buildroot}%{_javadir}/postgresql-jdbc2.jar
+ln -s postgresql-%{version}.jar %{buildroot}%{_javadir}/postgresql-jdbc2ee.jar
+ln -s postgresql-%{version}.jar %{buildroot}%{_javadir}/postgresql-jdbc3.jar
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%files
%defattr(-,root,root)
-%{_javadir}/postgresql-jdbc-%{version}.jar
+%{_javadir}/postgresql-%{version}.jar
+%{_javadir}/postgresql-%{version}.jre6.jar
+%{_javadir}/postgresql-%{version}.jre7.jar
+%{_javadir}/postgresql-jdbc-%{version}.jdbc4.jar
+%{_javadir}/postgresql-jdbc-%{version}.jdbc41.jar
+%{_javadir}/postgresql-jdbc-%{version}.jdbc42.jar
%{_javadir}/postgresql-jdbc.jar
-%{_javadir}/postgresql-tests-%{version}.jar
-%{_javadir}/postgresql-tests.jar
%{_javadir}/postgresql-jdbc2.jar
%{_javadir}/postgresql-jdbc2ee.jar
%{_javadir}/postgresql-jdbc3.jar
%{_javadir}/postgresql-jdbc4.jar
-%{_datadir}/maven2/poms
-%{_mavendepmapfragdir}
-%doc LICENSE README
-
-%files javadoc
-%defattr(-,root,root)
-%{_javadocdir}/postgresql-jdbc-%{version}
-%{_javadocdir}/postgresql-jdbc
-
-%files manual
-%defattr(-,root,root)
-%doc build/doc/build/doc/*
+%{_javadir}/postgresql-jdbc41.jar
+%{_javadir}/postgresql-jdbc42.jar
+%doc LICENSE
%changelog
+* Sun Dec 12 2021 Silvan Calarco 42.2.18-1mamba
+- update to 42.2.18
+
* Sat Mar 26 2011 gil 8.4.701-3mamba
- rebuilt with java-openjdk support
diff --git a/postgresql-jdpc-LICENSE b/postgresql-jdpc-LICENSE
new file mode 100644
index 0000000..b23f097
--- /dev/null
+++ b/postgresql-jdpc-LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 1997-2011, PostgreSQL Global Development Group
+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 PostgreSQL Global Development Group 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.
+