From d776ceee71e5a4b6c7a2eedef2e38de3467b11c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mari=C3=A1n=20Kon=C4=8Dek?= Date: Tue, 1 Apr 2025 15:42:18 +0200 Subject: [PATCH] Reformat .spec Related: RHEL-82790 --- postgresql-jdbc.spec | 65 ++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 4a8494a..c8e4c58 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -43,57 +43,55 @@ %{!?runselftest:%global runselftest 1} -%global section devel -%global source_path pgjdbc/src/main/java/org/postgresql +%global section devel +%global source_path pgjdbc/src/main/java/org/postgresql -Summary: JDBC driver for PostgreSQL -Name: postgresql-jdbc -Version: 42.7.1 -Release: 7%{?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 +Summary: JDBC driver for PostgreSQL +Name: postgresql-jdbc +Version: 42.7.1 +Release: 7%{?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 +BuildArch: noarch ExclusiveArch: %{java_arches} noarch -BuildRequires: java-devel >= 1.8 -BuildRequires: maven-local -BuildRequires: maven-enforcer-plugin -BuildRequires: 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) +Provides: pgjdbc = %version-%release + +BuildRequires: maven-local +BuildRequires: java-devel >= 1.8 +BuildRequires: maven-enforcer-plugin +BuildRequires: 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) %if %runselftest -BuildRequires: postgresql-contrib -BuildRequires: postgresql-test-rpm-macros +BuildRequires: postgresql-contrib +BuildRequires: postgresql-test-rpm-macros %endif # gettext is only needed if we try to update translations -#BuildRequires: gettext +#BuildRequires: gettext -Obsoletes: %{name}-parent-poms < 42.2.2-2 +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} +Summary: API docs for %{name} %description javadoc This package contains the API Documentation for %{name}. - %prep %setup -c -q @@ -122,7 +120,6 @@ rm src/test/java/org/postgresql/test/jdbc2/DriverTest.java \ src/test/java/org/postgresql/jdbcurlresolver/PgPassParserTest.java \ src/test/java/org/postgresql/util/StubEnvironmentAndProperties.java - %build # Ideally we would run "sh update-translations.sh" here, but that results # in inserting the build timestamp into the generated messages_*.class @@ -158,20 +155,16 @@ opts="-f" %mvn_build $opts --xmvn-javadoc - %install %mvn_install - %files -f .mfiles %license LICENSE %doc README.md - %files javadoc -f .mfiles-javadoc %license LICENSE - %changelog * Tue Oct 29 2024 Troy Dawson - 42.7.1-7 - Bump release for October 2024 mass rebuild: