Remove JDBC from this build; we will package it as separate SRPMpostgresql-8_1_3-2

3 files changed, 7 insertions, 8 deletions

diff --git a/.cvsignore b/.cvsignore
index 4f133b9..2600886 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,6 +3,3 @@ PyGreSQL-3.7.tgz
 pgtcl1.5.2.tar.gz
 pgtcldocs-20041108.zip
 postgresql-8.1-US.pdf
-postgresql-8.1-405.jdbc2.jar
-postgresql-8.1-405.jdbc2ee.jar
-postgresql-8.1-405.jdbc3.jar
diff --git a/postgresql.spec b/postgresql.spec
index 2b6ca39..42ed993 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -60,7 +60,7 @@
 %{!?aconfver:%define aconfver autoconf}
 
 %{!?tcldevel:%define tcldevel 1}
-%{!?jdbc:%define jdbc 1}
+%{!?jdbc:%define jdbc 0}
 %{!?test:%define test 1}
 %{!?python:%define python 1}
 %{!?pltcl:%define pltcl 1}
@@ -82,7 +82,7 @@
 Summary: PostgreSQL client programs and libraries.
 Name: postgresql
 Version: 8.1.3
-Release: 1.1
+Release: 2
 License: BSD
 Group: Applications/Databases
 Url: http://www.postgresql.org/ 
@@ -92,9 +92,11 @@ Source3: postgresql.init
 Source4: Makefile.regress
 Source5: pg_config.h
 Source6: README.rpm-dist
+%if %jdbc
 Source8: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2.jar
 Source9: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc2ee.jar
 Source10: http://jdbc.postgresql.org/download/postgresql-8.1-405.jdbc3.jar
+%endif
 Source14: postgresql.pam
 Source15: postgresql-bashprofile
 Source16: filter-requires-perl-Pg.sh
@@ -826,6 +828,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Mar 27 2006 Tom Lane <tgl@redhat.com> 8.1.3-2
+- Remove JDBC from this build; we will package it as separate SRPM
+
 * Mon Feb 13 2006 Jesse Keating <jkeating@redhat.com> - 8.1.3-1.1
 - rebump for build order issues during double-long bump
 
diff --git a/sources b/sources
index 7dcef5b..52cfdd7 100644
--- a/sources
+++ b/sources
@@ -3,6 +3,3 @@ bb510edbb533962c0692e211b3bd8cfa  postgresql-8.1.3.tar.bz2
 d19dfdcb54c334495d32456a043e0232  pgtcl1.5.2.tar.gz
 3d504b46231914d61fd49175f67e8715  pgtcldocs-20041108.zip
 66d80897840724917cb838c76393692b  postgresql-8.1-US.pdf
-32e874651c4916bfd1a827c503d3505a  postgresql-8.1-405.jdbc2.jar
-80ca36179ab2ea0fd4e8dbf6d76ade6a  postgresql-8.1-405.jdbc2ee.jar
-2b699f0e686bcf7ec56bea16474ab2c2  postgresql-8.1-405.jdbc3.jar