summaryrefslogtreecommitdiffstats
path: root/pki/linux/java-tools
diff options
context:
space:
mode:
Diffstat (limited to 'pki/linux/java-tools')
-rw-r--r--pki/linux/java-tools/pki-java-tools.spec12
1 files changed, 8 insertions, 4 deletions
diff --git a/pki/linux/java-tools/pki-java-tools.spec b/pki/linux/java-tools/pki-java-tools.spec
index 7f4454338..d8075f440 100644
--- a/pki/linux/java-tools/pki-java-tools.spec
+++ b/pki/linux/java-tools/pki-java-tools.spec
@@ -33,7 +33,7 @@
## Package Header Definitions
%define base_name %{base_prefix}-%{base_component}
%define base_version 1.0.0
-%define base_release 1
+%define base_release 2
%define base_group System Environment/Shells
%define base_vendor Red Hat, Inc.
%define base_license GPLv2 with exceptions
@@ -65,7 +65,7 @@
## A distribution model is required on certain Linux operating systems!
##
## check for a pre-defined distribution model
-%define undefined_distro %(test "%{dist}"="" && echo 1 || echo 0)
+%define undefined_distro %(test "%{dist}" = "" && echo 1 || echo 0)
%if %{undefined_distro}
%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
%if %{is_fedora}
@@ -116,10 +116,10 @@ BuildRoot: %{_builddir}/%{base_name}-root
## Technically, "ant" should not need to be in "BuildRequires" since
## it is the Java equivalent of "make" (and/or "Autotools").
##
-BuildRequires: ant >= 1.6.2, %{base_prefix}-util >= 1.0.0, java-devel >= 1.4.2, jpackage-utils >= 1.6.0, jss >= 4.2.4
+BuildRequires: ant >= 1.6.2, %{base_prefix}-util >= 1.0.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4
## Without Requires something, rpmbuild will abort!
-Requires: %{base_prefix}-native-tools >= 1.0.0, %{base_prefix}-util >= 1.0.0, java >= 1.4.2
+Requires: %{base_prefix}-native-tools >= 1.0.0, %{base_prefix}-util >= 1.0.0, java >= 1.6.0
## This package is non-relocatable!
@@ -255,6 +255,10 @@ rm -rf ${RPM_BUILD_ROOT}
###############################################################################
%changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-2
+- Bugzilla Bug #472305 - "equality" tests in all spec files need to be fixed
+- Bumped "java" and "java-devel" 1.4.2 and 1.5.0 dependencies to 1.6.0
+- Changed "java-sdk" to "java-devel" for consistency
* Tue Feb 19 2008 PKI Team <pki-devel@redhat.com> 1.0.0-1
- Initial open source version based upon proprietary
Red Hat Certificate System (RHCS) 7.3.