diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 7524f26..6832b70 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -45,7 +45,7 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc Version: 42.2.2 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://jdbc.postgresql.org/ @@ -82,20 +82,14 @@ BuildRequires: postgresql-test-rpm-macros # 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 parent-poms -Summary: Build dependency management for PostgreSQL JDBC driver. - -%description parent-poms -Pom files bringing dependencies required for successful PostgreSQL JDBC driver -build. - - %package javadoc Summary: API docs for %{name} @@ -126,8 +120,8 @@ find -name "*.jar" -or -name "*.class" | xargs rm -f # 0af97ce32de877 commit. %mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql -# Parent POMs should be installed in a separate subpackage. -%mvn_package ":*{parent,versions,prevjre}*" parent-poms +# 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 @@ -183,16 +177,14 @@ opts="-f" %doc README.md -%files parent-poms -f .mfiles-parent-poms -%license LICENSE -%doc pgjdbc-parent-poms/CHANGELOG.md pgjdbc-parent-poms/README.md - - %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Wed May 30 2018 Mikolaj Izdebski - 42.2.2-4 +- Remove and obsolete parent-poms subpackage + * Fri Apr 20 2018 Pavel Raiskup - 42.2.2-3 - provide postgresql.jar, as that's the upstream's artifactId