rpms/postgresql-jdbc/F-12 postgresql-jdbc.pom, 1.1, 1.2 postgresql-jdbc.spec, 1.20, 1.21

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/postgresql-jdbc/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17532

Modified Files:
	postgresql-jdbc.pom postgresql-jdbc.spec 
Log Message:
Seems the .pom file *must* have a package version number in it


Index: postgresql-jdbc.pom
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/F-12/postgresql-jdbc.pom,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- postgresql-jdbc.pom	23 Nov 2009 16:41:26 -0000	1.1
+++ postgresql-jdbc.pom	24 Nov 2009 19:50:51 -0000	1.2
@@ -6,6 +6,7 @@
   <packaging>jar</packaging>
   <name>PostgreSQL JDBC Driver</name>
 
+  <version>UPSTREAM_VERSION</version>
   <url>http://jdbc.postgresql.org</url>
   <description>The PostgreSQL Driver JDBC4</description>
   <licenses>


Index: postgresql-jdbc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/postgresql-jdbc/F-12/postgresql-jdbc.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- postgresql-jdbc.spec	23 Nov 2009 16:41:26 -0000	1.20
+++ postgresql-jdbc.spec	24 Nov 2009 19:50:51 -0000	1.21
@@ -38,8 +38,8 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	8.4.701
-Release:	2%{?dist}
-# ASL 2.0 applies only to postgresql-jdbc.pom file
+Release:	3%{?dist}
+# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
 License:	BSD and ASL 2.0
 Group:		Applications/Databases
 URL:		http://jdbc.postgresql.org/
@@ -119,9 +119,10 @@ popd
 aot-compile-rpm
 %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 -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
 
 %clean
@@ -152,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/maven2/poms/JPP-%{name}.pom
 
 %changelog
+* Tue Nov 24 2009 Tom Lane <tgl at 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 at redhat.com> 8.4.701-2
 - Add a .pom file to ease use by maven-based packages (courtesy Deepak Bhole)
 Resolves: #538487