[postgresql-jdbc/f16] Add BuildRequires: java-1.6.0-openjdk-devel
Tom Lane
tgl at fedoraproject.org
Mon Aug 15 20:35:55 UTC 2011
commit 38ca5c738e27e3e63be75d2245ef094659c77501
Author: Tom Lane <tgl at redhat.com>
Date: Mon Aug 15 16:35:37 2011 -0400
Add BuildRequires: java-1.6.0-openjdk-devel
postgresql-jdbc.spec | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
---
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 1163ca6..646cbaf 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -38,7 +38,7 @@
Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc
Version: 9.0.801
-Release: 3%{?dist}
+Release: 4%{?dist}
# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD
License: BSD and ASL 2.0
Group: Applications/Databases
@@ -51,10 +51,12 @@ Source1: postgresql-jdbc.pom
%if ! %{gcj_support}
BuildArch: noarch
%endif
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: ant >= 0:1.6.2
-BuildRequires: ant-junit >= 0:1.6.2
-BuildRequires: junit >= 0:3.7
+# We require Java 1.6 because we support JDBC 4.0, not 4.1
+BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: jpackage-utils
+BuildRequires: ant
+BuildRequires: ant-junit
+BuildRequires: junit
BuildRequires: findutils
# gettext is only needed if we try to update translations
#BuildRequires: gettext
@@ -63,8 +65,10 @@ BuildRequires: java-gcj-compat-devel >= 1.0.31
Requires(post): java-gcj-compat >= 1.0.31
Requires(postun): java-gcj-compat >= 1.0.31
%endif
-Requires(post): jpackage-utils >= 0:1.7.2
-Requires(postun): jpackage-utils >= 0:1.7.2
+Requires: java
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Obsoletes: rh-postgresql-jdbc
@@ -154,6 +158,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mavenpomdir}/JPP-%{name}.pom
%changelog
+* Mon Aug 15 2011 Tom Lane <tgl at redhat.com> 9.0.801-4
+- Add BuildRequires: java-1.6.0-openjdk-devel to ensure we have recent JDK
+Related: #730588
+- Remove long-obsolete minimum versions from BuildRequires
+
* Sun Jul 17 2011 Tom Lane <tgl at redhat.com> 9.0.801-3
- Switch to non-GCJ build, since GCJ is now deprecated in Fedora
Resolves: #722247
More information about the scm-commits
mailing list