From 594f1eae5a12cc6818c0bda1652d7b02eedcf3ae Mon Sep 17 00:00:00 2001 From: xiaoji <345865759@163.com> Date: Tue, 21 Jan 2025 18:50:50 +0800 Subject: [PATCH 1/3] updated to 42.7.5 --- postgresql-jdbc.spec | 80 +++++++++++++++++--------------------------- sources | 2 +- 2 files changed, 32 insertions(+), 50 deletions(-) diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index fa103a1..ff7a10c 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -1,30 +1,19 @@ -# Copyright (c) 2000-2005, JPackage Project -# https://github.com/fedora-java/javapackages/blob/master/LICENSE - -Summary: JDBC driver for PostgreSQL -Name: postgresql-jdbc -Version: 42.5.6 -Release: 3%{?dist} -License: BSD-2-Clause -URL: http://jdbc.postgresql.org/ +Summary: JDBC driver for PostgreSQL +Name: postgresql-jdbc +Version: 42.7.5 +Release: 1%{?dist} +License: BSD-2-Clause +URL: http://jdbc.postgresql.org/ Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/postgresql-%{version}-jdbc-src.tar.gz -Provides: pgjdbc = %version-%release - -BuildArch: noarch +BuildArch: noarch ExclusiveArch: %{java_arches} noarch - -BuildRequires: java-devel -BuildRequires: maven-local maven-enforcer-plugin maven-plugin-bundle -BuildRequires: classloader-leak-test-framework -BuildRequires: mvn(com.ongres.scram:client) -BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) -BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) -BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) +BuildRequires: java-devel +BuildRequires: maven-buildrequires # For selftest BuildRequires: postgresql-contrib postgresql-test-rpm-macros - +Provides: pgjdbc = %{version}-%{release} +Requires: java-headless +Requires: javapackages-filesystem %description The PostgreSQL JDBC Driver allows Java programs to connect to a PostgreSQL database @@ -32,27 +21,10 @@ using standard, database independent Java code. pgJDBC is an open source JDBC dr written in Pure Java (Type 4), and communicates in the PostgreSQL native network protocol. -%package javadoc -Summary: API docs for %{name} - -%description javadoc -This package contains the API Documentation for %{name}. - %prep -%setup -c -q -mv postgresql-%{version}-jdbc-src/* . -find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f +%setup -n postgresql-%{version}-jdbc-src -%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" -%mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql -%mvn_alias org.postgresql:postgresql postgresql:postgresql -%pom_remove_dep uk.org.webcompere:system-stubs-jupiter -rm src/test/java/org/postgresql/test/jdbc2/DriverTest.java \ - src/test/java/org/postgresql/util/OSUtilTest.java \ - src/test/java/org/postgresql/jdbcurlresolver/PgServiceConfParserTest.java \ - src/test/java/org/postgresql/jdbcurlresolver/PgPassParserTest.java \ - src/test/java/org/postgresql/util/StubEnvironmentAndProperties.java %build @@ -75,23 +47,33 @@ EOF %postgresql_tests_start -%mvn_build $opts --xmvn-javadoc +JAVA_HOME=/usr/lib/jvm/java PATH="/usr/lib/jvm/java/bin:${PATH}" ~/.local/apache-maven-3.9.9/bin/mvn -o -Dmaven.repo.local=/usr/lib/maven/repository/ -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package +cp target/original-postgresql-%{version}.jar postgresql.jar %install -%mvn_install - - -%files -f .mfiles +mkdir -p %{buildroot}%{_datadir}/java/postgresql-jdbc/ +cp postgresql.jar %{buildroot}%{_datadir}/java/postgresql-jdbc/ +pushd %{buildroot}%{_datadir}/java/ +ln -s postgresql-jdbc/postgresql.jar postgresql.jar +ln -s postgresql-jdbc/postgresql.jar postgresql-jdbc.jar +popd + +%files %license LICENSE %doc README.md +%{_datadir}/java/postgresql-jdbc/postgresql.jar +%{_datadir}/java/postgresql.jar +%{_datadir}/java/postgresql-jdbc.jar -%files javadoc -f .mfiles-javadoc -%license LICENSE - %changelog +* Tue Jan 21 2025 Zhao Zhen - 42.7.5-1 +- rewrite build script +- updated to upstream 42.7.5 +- lack .pom amd .xml files + * Thu Sep 26 2024 OpenCloudOS Release Engineering - 42.5.6-3 - Rebuilt for clarifying the packages requirement in BaseOS and AppStream diff --git a/sources b/sources index f6db6f4..b1f00a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (postgresql-42.5.6-jdbc-src.tar.gz) = d4b5f21a6b71c73b4323889b6866eae301cf93d7056e40d00516a537bde23231f1e0ef42e435333cccb282a0698716e73ff15ab618476f202fcda83bbdec5bb3 +SHA512 (postgresql-42.7.5-jdbc-src.tar.gz) = 4e7fc7167ab9f63bd73a3d5c50787360e29d444bbfb677baa60c519418ebc243c2144639d1817fd223fe2f7fcc47294253eb83dda9fe0484abf5cdf76821000b -- Gitee From a5f9e01b09e804490f58267326335d70667e6d94 Mon Sep 17 00:00:00 2001 From: xiaoji Date: Thu, 23 Jan 2025 11:09:46 +0800 Subject: [PATCH 2/3] small fix --- postgresql-jdbc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index ff7a10c..8700852 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -47,7 +47,7 @@ EOF %postgresql_tests_start -JAVA_HOME=/usr/lib/jvm/java PATH="/usr/lib/jvm/java/bin:${PATH}" ~/.local/apache-maven-3.9.9/bin/mvn -o -Dmaven.repo.local=/usr/lib/maven/repository/ -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package +JAVA_HOME=/usr/lib/jvm/java PATH="/usr/lib/jvm/java/bin:${PATH}" mvn -o -Dmaven.repo.local=/usr/lib/maven/repository/ -Dmaven.test.skip=true -Dmaven.javadoc.skip=true package cp target/original-postgresql-%{version}.jar postgresql.jar -- Gitee From 832154c5d7756922387e7847212e0b1177b57700 Mon Sep 17 00:00:00 2001 From: xiaoji <345865759@163.com> Date: Fri, 24 Jan 2025 08:44:23 +0800 Subject: [PATCH 3/3] small fix --- postgresql-jdbc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 8700852..cfea7b1 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -8,6 +8,7 @@ Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/pos BuildArch: noarch ExclusiveArch: %{java_arches} noarch BuildRequires: java-devel +BuildRequires: maven >= 3.9.9 BuildRequires: maven-buildrequires # For selftest BuildRequires: postgresql-contrib postgresql-test-rpm-macros -- Gitee