Bundle shaded ongres-* dependencies

Resolves: RHEL-140155
This commit is contained in:
Marian Koncek 2026-01-09 15:43:53 +01:00
parent 727b5d5e1e
commit 11b41cd0c0

View File

@ -49,7 +49,7 @@
Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc
Version: 42.7.1
Release: 8%{?dist}
Release: 9%{?dist}
License: BSD-2-Clause
URL: https://jdbc.postgresql.org/
Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/postgresql-%{version}-jdbc-src.tar.gz
@ -62,6 +62,7 @@ BuildRequires: maven-local
BuildRequires: mvn(com.ongres.scram:client)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
BuildRequires: mvn(se.jiderhamn:classloader-leak-test-framework)
@ -75,6 +76,11 @@ BuildRequires: postgresql-test-rpm-macros
Obsoletes: %{name}-parent-poms < 42.2.2-2
Provides: bundled(mvn(com.ongres.stringprep:saslprep)) = 1.1
Provides: bundled(mvn(com.ongres.stringprep:stringprep)) = 1.1
Provides: bundled(mvn(com.ongres.scram:common)) = 2.1
Provides: bundled(mvn(com.ongres.scram:client)) = 2.1
%description
PostgreSQL is an advanced Object-Relational database management
system. The postgresql-jdbc package includes the .jar files needed for
@ -94,9 +100,6 @@ mv postgresql-%{version}-jdbc-src/* .
# remove any binary libs
find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f
# Build parent POMs in the same Maven call.
%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']"
# compat symlink: requested by dtardon (libreoffice), reverts part of
# 0af97ce32de877 commit.
%mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql
@ -163,6 +166,9 @@ opts="-f"
%license LICENSE
%changelog
* Fri Jan 09 2026 Marian Koncek <mkoncek@redhat.com> - 42.7.1-9
- Bundle shaded ongres-* dependencies
* Tue Apr 01 2025 Marián Konček <mkoncek@redhat.com> - 42.7.1-8
- Fix BuildRequires