Seems the .pom file *must* have a package version number in it

This commit is contained in:
Tom Lane 2009-11-24 19:42:51 +00:00
parent ab42ddb9fd
commit c048553af9
2 changed files with 10 additions and 4 deletions

View File

@ -6,6 +6,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<name>PostgreSQL JDBC Driver</name> <name>PostgreSQL JDBC Driver</name>
<version>UPSTREAM_VERSION</version>
<url>http://jdbc.postgresql.org</url> <url>http://jdbc.postgresql.org</url>
<description>The PostgreSQL Driver JDBC4</description> <description>The PostgreSQL Driver JDBC4</description>
<licenses> <licenses>

View File

@ -38,8 +38,8 @@
Summary: JDBC driver for PostgreSQL Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc Name: postgresql-jdbc
Version: 8.4.701 Version: 8.4.701
Release: 2%{?dist} Release: 3%{?dist}
# ASL 2.0 applies only to postgresql-jdbc.pom file # ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
License: BSD and ASL 2.0 License: BSD and ASL 2.0
Group: Applications/Databases Group: Applications/Databases
URL: http://jdbc.postgresql.org/ URL: http://jdbc.postgresql.org/
@ -119,9 +119,10 @@ popd
aot-compile-rpm aot-compile-rpm
%endif %endif
# Install the pom # Install the pom after inserting the correct version number
sed 's/UPSTREAM_VERSION/%{upstreamver}/g' %{SOURCE1} >JPP-postgresql-jdbc.pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms/
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-postgresql-jdbc.pom install -m 644 JPP-postgresql-jdbc.pom $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-postgresql-jdbc.pom
%add_to_maven_depmap postgresql postgresql %{version} JPP postgresql-jdbc %add_to_maven_depmap postgresql postgresql %{version} JPP postgresql-jdbc
%clean %clean
@ -152,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/maven2/poms/JPP-%{name}.pom %{_datadir}/maven2/poms/JPP-%{name}.pom
%changelog %changelog
* Tue Nov 24 2009 Tom Lane <tgl@redhat.com> 8.4.701-3
- Seems the .pom file *must* have a package version number in it, sigh
Resolves: #538487
* Mon Nov 23 2009 Tom Lane <tgl@redhat.com> 8.4.701-2 * Mon Nov 23 2009 Tom Lane <tgl@redhat.com> 8.4.701-2
- Add a .pom file to ease use by maven-based packages (courtesy Deepak Bhole) - Add a .pom file to ease use by maven-based packages (courtesy Deepak Bhole)
Resolves: #538487 Resolves: #538487