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


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@142 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

25 files changed, 173 insertions, 73 deletions

diff --git a/pki/linux/ca-ui/pki-ca-ui.spec b/pki/linux/ca-ui/pki-ca-ui.spec
index 1daee1fc2..be2310a0f 100644
--- a/pki/linux/ca-ui/pki-ca-ui.spec
+++ b/pki/linux/ca-ui/pki-ca-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      5
+%define base_release      6
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
+- 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 Nov 18 2008 Christina Fu <cfu@redhat.com> 1.0.0-5
 - Bugzilla Bug #471622 - Need Renewal feature via enrollment profile Framework (phase 1)
 * Wed Oct 15 2008 Andrew Wnuk <awnuk@redhat.com> 1.0.0-4
diff --git a/pki/linux/ca/pki-ca.spec b/pki/linux/ca/pki-ca.spec
index 2f1149751..0e17f1dbd 100644
--- a/pki/linux/ca/pki-ca.spec
+++ b/pki/linux/ca/pki-ca.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      14
+%define base_release      15
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -91,7 +91,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}
@@ -142,7 +142,7 @@ 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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_name}-ui, %{base_prefix}-common >= 1.0.0
@@ -282,6 +282,10 @@ fi
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-15
+- 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 Nov 18 2008 Christina Fu <cfu@redhat.com> 1.0.0-14
 - Bugzilla Bug #471622 - Need Renewal feature via enrollment profile Framework (phase 1)
 * Fri Oct 10 2008 Jack Magne <jmagne@redhat.com> 1.0.0-13
diff --git a/pki/linux/common-ui/pki-common-ui.spec b/pki/linux/common-ui/pki-common-ui.spec
index 504ef385f..94f00c1e9 100644
--- a/pki/linux/common-ui/pki-common-ui.spec
+++ b/pki/linux/common-ui/pki-common-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-5
+- 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
 * Mon Oct 27 2008 alee <alee@redhat.com> 1.0.0-4
 - Fix for Bug# 223324.
 * Wed Sep 24 2008 alee <alee@redhat.com> 1.0.0-3
diff --git a/pki/linux/common/pki-common.spec b/pki/linux/common/pki-common.spec
index cdb2afd7b..c90f0562a 100644
--- a/pki/linux/common/pki-common.spec
+++ b/pki/linux/common/pki-common.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      26
+%define base_release      27
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -84,7 +84,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}
@@ -135,10 +135,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, %{base_ui} >= 1.0.0, java-devel >= 1.4.2, jpackage-utils >= 1.6.0, jss >= 4.2.4, ldapjdk >= 4.17, osutil >= 1.0.0, symkey >= 1.0.0, velocity >= 1.4
+BuildRequires:  ant >= 1.6.2, %{base_prefix}-util >= 1.0.0, %{base_ui} >= 1.0.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4, ldapjdk >= 4.17, osutil >= 1.0.0, symkey >= 1.0.0, velocity >= 1.4
 
 ## Without Requires something, rpmbuild will abort!
-Requires:       %{base_name}-ui, %{base_prefix}-java-tools >= 1.0.0, %{base_prefix}-setup >= 1.0.0, java >= 1.4.2, osutil >= 1.0.0, rhgb >= 0.14.1, symkey >= 1.0.0, tomcatjss >= 1.1.0, velocity >= 1.4
+Requires:       %{base_name}-ui, %{base_prefix}-java-tools >= 1.0.0, %{base_prefix}-setup >= 1.0.0, java >= 1.6.0, osutil >= 1.0.0, rhgb >= 0.14.1, symkey >= 1.0.0, tomcatjss >= 1.1.0, velocity >= 1.4
 
 
 ## This package conflicts with the following packages!
@@ -298,6 +298,10 @@ chmod 00755 %{_datadir}/%{base_prefix}/setup/postinstall
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-27
+- 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 Nov 18 2008 Christina Fu <cfu@redhat.com> 1.0.0-26
 - Bugzilla Bug #471622 - Need Renewal feature via enrollment profile Framework (Phase 1)
 * Mon Oct 27 2008 Ade Lee <alee@redhat.com> 1.0.0-25
diff --git a/pki/linux/console-ui/pki-console-ui.spec b/pki/linux/console-ui/pki-console-ui.spec
index 44fa0b3f0..9b764446b 100644
--- a/pki/linux/console-ui/pki-console-ui.spec
+++ b/pki/linux/console-ui/pki-console-ui.spec
@@ -34,7 +34,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/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -113,7 +113,7 @@ 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, java-devel >= 1.4.2, jpackage-utils >= 1.6.0, jss >= 4.2.4, ldapjdk >= 4.17
+BuildRequires:  ant >= 1.6.2, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4, ldapjdk >= 4.17
 
 ## Without Requires something, rpmbuild will abort!
 Requires:       jss >= 4.2.4, ldapjdk >= 4.17
@@ -223,6 +223,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.
diff --git a/pki/linux/console/pki-console.spec b/pki/linux/console/pki-console.spec
index 6e4dc210c..5a12f4b5c 100644
--- a/pki/linux/console/pki-console.spec
+++ b/pki/linux/console/pki-console.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      7
+%define base_release      8
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -42,7 +42,7 @@
 %define base_url          http://pki-svn.fedora.redhat.com/wiki/PKI_Documentation
 
 ## Helper Definitions
-%define pki_jdk           java-1.5.0-ibm-devel >= 1.5.0.3
+%define pki_jdk           java-devel >= 1.6.0
 %define pki_ca            %{base_entity} Certificate Authority
 %define pki_drm           %{base_entity} Data Recovery Manager
 %define pki_ds            Fedora Directory Server
@@ -62,9 +62,9 @@
 ## Bugzilla Bug #246173:  The following section is necessary due to
 ## Bugzilla Bug #232224 and is related to using the IBM JDK with a
 ## specific version of glibc on specific platforms on specific architectures
-%ifarch x86_64
+#%ifarch x86_64
 #export LD_PRELOAD=/usr/lib/jvm/java-1.5.0-ibm-1.5.0.3.x86_64/jre/bin/libj9vm23.so:/usr/lib/jvm/java-1.5.0-ibm-1.5.0.3.x86_64/jre/bin/libj9thr23.so:/usr/lib/jvm/java-1.5.0-ibm-1.5.0.3.x86_64/jre/bin/libjsig.so
-%endif
+#%endif
 
 ## check for presence of UI packages
 %define linux_ui          %(echo `rpm -q --quiet %{base_name}-ui; echo $?`)
@@ -88,7 +88,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}
@@ -99,12 +99,12 @@
 %define openjdk           %(test %{dist_version} -ge 9 && echo 1 || echo 0)
 %if %{openjdk}
 ## redefine the JDK used to build on Fedora 9 Linux
-%define pki_jdk           java-sdk >= 1.6.0
+%define pki_jdk           java-devel >= 1.6.0
 %endif
 %define openjdk           %(test %{dist_version} -eq 8 && echo 1 || echo 0)
 %if %{openjdk}
 ## redefine the JDK used to build on Fedora 8 Linux
-%define pki_jdk           java-sdk >= 1.7.0
+%define pki_jdk           java-devel >= 1.7.0
 %endif
 %else
 %define is_redhat         %(test -e /etc/redhat-release && echo 1 || echo 0)
@@ -260,6 +260,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-8
+- 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
 * Mon Oct 13 2008 Andrew Wnuk <awnuk@redhat.com> 1.0.0-7
 - Bugzilla bug #466781 - Starting console without subsystem type is causing StringIndexOutOfBoundsException
 - Bugzilla bug #440546 - Console CLI crashes when not prefixed with "https://"
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.
diff --git a/pki/linux/kra-ui/pki-kra-ui.spec b/pki/linux/kra-ui/pki-kra-ui.spec
index 1c2417805..6c4266643 100644
--- a/pki/linux/kra-ui/pki-kra-ui.spec
+++ b/pki/linux/kra-ui/pki-kra-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3
+- 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 May 6 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-2
 - Fixed typo - bugzilla bug #304668
 * Tue Feb 19 2008 PKI Team <pki-devel@redhat.com> 1.0.0-1
diff --git a/pki/linux/kra/pki-kra.spec b/pki/linux/kra/pki-kra.spec
index 038b88b71..996b3aec2 100644
--- a/pki/linux/kra/pki-kra.spec
+++ b/pki/linux/kra/pki-kra.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      5
+%define base_release      6
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -91,7 +91,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}
@@ -142,7 +142,7 @@ 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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_name}-ui, %{base_prefix}-common >= 1.0.0
@@ -289,6 +289,10 @@ fi
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
+- 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
 * Fri Oct 10  2008 Jack Magne   <jmagne@redhat.com> 1.0.0-5
 - Fix for port separation bug #466188.
 * Mon Sep 22 2008 Christina Fu <cfu@redhat.com> 1.0.0-4
diff --git a/pki/linux/manage/pki-manage.spec b/pki/linux/manage/pki-manage.spec
index ce1566edd..ceb21c6be 100644
--- a/pki/linux/manage/pki-manage.spec
+++ b/pki/linux/manage/pki-manage.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
@@ -61,7 +61,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}
@@ -226,6 +226,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.
diff --git a/pki/linux/migrate/pki-migrate.spec b/pki/linux/migrate/pki-migrate.spec
index 206ca12c3..e20c418a7 100644
--- a/pki/linux/migrate/pki-migrate.spec
+++ b/pki/linux/migrate/pki-migrate.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -61,7 +61,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}
@@ -283,6 +283,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3
+- 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
 * Fri Oct 10 2008 Ade Lee <alee@redhat.com> 1.0.0-2
 - Migration scripts for 8.0 Security Domain #223361
 * Tue Feb 19 2008 PKI Team <pki-devel@redhat.com> 1.0.0-1
diff --git a/pki/linux/native-tools/pki-native-tools.spec b/pki/linux/native-tools/pki-native-tools.spec
index 058d41b24..1a5bf7f1c 100644
--- a/pki/linux/native-tools/pki-native-tools.spec
+++ b/pki/linux/native-tools/pki-native-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
@@ -81,7 +81,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}
@@ -250,6 +250,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.
diff --git a/pki/linux/ocsp-ui/pki-ocsp-ui.spec b/pki/linux/ocsp-ui/pki-ocsp-ui.spec
index 8c9d62529..f7568817e 100644
--- a/pki/linux/ocsp-ui/pki-ocsp-ui.spec
+++ b/pki/linux/ocsp-ui/pki-ocsp-ui.spec
@@ -34,7 +34,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/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,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.
diff --git a/pki/linux/ocsp/pki-ocsp.spec b/pki/linux/ocsp/pki-ocsp.spec
index 7b29b8a77..e12ef0d0d 100644
--- a/pki/linux/ocsp/pki-ocsp.spec
+++ b/pki/linux/ocsp/pki-ocsp.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -91,7 +91,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}
@@ -142,7 +142,7 @@ 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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_name}-ui, %{base_prefix}-common >= 1.0.0
@@ -298,6 +298,10 @@ fi
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-5
+- 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
 * Thu Oct 10 2008 Jack Magne  <jmagne@redhat.com> 1.0.0-4
 - Fix for port separation bug #466188.
 * Thu Jul 10 2008 Jack Magne  <jmagne@redhat.com> 1.0.0-3
diff --git a/pki/linux/osutil/osutil.spec b/pki/linux/osutil/osutil.spec
index 294f153cf..79bafaabd 100644
--- a/pki/linux/osutil/osutil.spec
+++ b/pki/linux/osutil/osutil.spec
@@ -27,7 +27,7 @@
 ## Package Header Definitions
 %define base_name         %{base_component}
 %define base_version      1.0.0
-%define base_release      1
+%define base_release      2
 %define base_group        System Environment/Libraries
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -68,7 +68,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}
@@ -118,7 +118,7 @@ BuildRoot:      %{_builddir}/%{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, bash >= 3.0, java-devel >= 1.4.2, jpackage-utils >= 1.6.0, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5
+BuildRequires:  ant >= 1.6.2, bash >= 3.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5
 
 ## Without Requires something, rpmbuild will abort!
 Requires:       jpackage-utils >= 1.6.0, nspr >= 4.6.5, nss >= 3.11.5
@@ -234,6 +234,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.
diff --git a/pki/linux/ra-ui/pki-ra-ui.spec b/pki/linux/ra-ui/pki-ra-ui.spec
index b10b18b71..840f1d937 100644
--- a/pki/linux/ra-ui/pki-ra-ui.spec
+++ b/pki/linux/ra-ui/pki-ra-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3
+- 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
 * Thu Oct 02 2008 Jack Magne <jmagne@redhat.com>  1.0.0-2
 - Fix for Vista support, #405451
 * Tue Feb 19 2008 PKI Team <pki-devel@redhat.com> 1.0.0-1
diff --git a/pki/linux/ra/pki-ra.spec b/pki/linux/ra/pki-ra.spec
index 279b1cfab..fa3cd3992 100644
--- a/pki/linux/ra/pki-ra.spec
+++ b/pki/linux/ra/pki-ra.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      3
+%define base_release      4
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -83,7 +83,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}
@@ -264,6 +264,10 @@ fi
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4
+- 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 Aug 5 2008 Ade Lee <alee@redhat.com> 1.0.0-3
 - Fix for bug#454565 - Broken Installation Wizard for TPS and RA with latest modutil.
 * Tue Apr 1 2008 Jack Magne <jmagne@redhat.com> 1.0.0-2
diff --git a/pki/linux/setup/pki-setup.spec b/pki/linux/setup/pki-setup.spec
index 36ffd3522..940812d84 100644
--- a/pki/linux/setup/pki-setup.spec
+++ b/pki/linux/setup/pki-setup.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      5
+%define base_release      6
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -61,7 +61,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}
@@ -217,6 +217,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
+- 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
 * Thu Oct 9  2008 Jack Magne  <jmagne@redhat.com> 1.0.0-5
 - Fix for port separation bug #466188.
 * Fri Oct 9 2008 Ade Lee  <alee@redhat.com> 1.0.0-4
diff --git a/pki/linux/silent/pki-silent.spec b/pki/linux/silent/pki-silent.spec
index 18a6abdd7..ee89fd90d 100644
--- a/pki/linux/silent/pki-silent.spec
+++ b/pki/linux/silent/pki-silent.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Shells
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -61,7 +61,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}
@@ -112,7 +112,7 @@ 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}-common >= 1.0.0, %{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}-common >= 1.0.0, %{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}-common >= 1.0.0
@@ -231,6 +231,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3
+- 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
 * Thu Oct 9 2008 Ade Lee <alee@redhat.com> 1.0.0-2
 - Fix for 462035
 * Tue Feb 19 2008 PKI Team <pki-devel@redhat.com> 1.0.0-1
diff --git a/pki/linux/symkey/symkey.spec b/pki/linux/symkey/symkey.spec
index f419a4817..f57baedbf 100644
--- a/pki/linux/symkey/symkey.spec
+++ b/pki/linux/symkey/symkey.spec
@@ -27,7 +27,7 @@
 ## Package Header Definitions
 %define base_name         %{base_component}
 %define base_version      1.0.0
-%define base_release      1
+%define base_release      2
 %define base_group        System Environment/Libraries
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -68,7 +68,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}
@@ -118,7 +118,7 @@ BuildRoot:      %{_builddir}/%{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, bash >= 3.0, java-devel >= 1.4.2, jpackage-utils >= 1.6.0, jss >= 4.2.4, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5
+BuildRequires:  ant >= 1.6.2, bash >= 3.0, java-devel >= 1.6.0, jpackage-utils >= 1.6.0, jss >= 4.2.4, nspr-devel >= 4.6.5, nss-devel >= 3.11.5, nss-pkcs11-devel >= 3.11.5
 
 ## Without Requires something, rpmbuild will abort!
 Requires:       jpackage-utils >= 1.6.0, jss >= 4.2.4, nspr >= 4.6.5, nss >= 3.11.5
@@ -234,6 +234,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.
diff --git a/pki/linux/tks-ui/pki-tks-ui.spec b/pki/linux/tks-ui/pki-tks-ui.spec
index 37ec7f0c7..4043338af 100644
--- a/pki/linux/tks-ui/pki-tks-ui.spec
+++ b/pki/linux/tks-ui/pki-tks-ui.spec
@@ -34,7 +34,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/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,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.
diff --git a/pki/linux/tks/pki-tks.spec b/pki/linux/tks/pki-tks.spec
index 23d5edcbe..06d88df67 100644
--- a/pki/linux/tks/pki-tks.spec
+++ b/pki/linux/tks/pki-tks.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      4
+%define base_release      5
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -91,7 +91,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}
@@ -142,7 +142,7 @@ 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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_ui} >= 1.0.0, %{base_prefix}-common >= 1.0.0, %{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_name}-ui, %{base_prefix}-common >= 1.0.0
@@ -291,7 +291,11 @@ fi
 ###############################################################################
 
 %changelog
-* Fri Oct 10 2008 Jack Magne  <jmagne@redhat.com> 1.0.0-3
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-5
+- 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
+* Fri Oct 10 2008 Jack Magne  <jmagne@redhat.com> 1.0.0-4
 - Fix for port separation bug #466188.
 * Thu Jul 10 2008 Jack Magne  <jmagne@redhat.com> 1.0.0-3
 - Fix for bug #458337.
diff --git a/pki/linux/tps-ui/pki-tps-ui.spec b/pki/linux/tps-ui/pki-tps-ui.spec
index b9f6811bc..a88367d64 100644
--- a/pki/linux/tps-ui/pki-tps-ui.spec
+++ b/pki/linux/tps-ui/pki-tps-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      2
+%define base_release      3
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -62,7 +62,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}
@@ -221,6 +221,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-3
+- 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
 * Thu Apr  3 2008 Jack Magne <jmagne@redhat.com> 1.0.0-2
 - Get default external Enrollment UI working. Bug#440960.
 * Tue Feb 19 2008 PKI Team <pki-devel@redhat.com> 1.0.0-1
diff --git a/pki/linux/tps/pki-tps.spec b/pki/linux/tps/pki-tps.spec
index 7ab36c63b..f28cf0fde 100644
--- a/pki/linux/tps/pki-tps.spec
+++ b/pki/linux/tps/pki-tps.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      3
+%define base_release      4
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      LGPLv2 with exceptions
@@ -107,7 +107,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}
@@ -312,6 +312,10 @@ fi
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-4
+- 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 Aug 5 2008 Ade Lee <alee@redhat.com> 1.0.0-3
 - Fix for bug#454565 - Broken Installation Wizard for TPS and RA with latest modutil.
 * Tue Apr 1 2008 Jack Magne <jmagne@redhat.com> 1.0.0-2
diff --git a/pki/linux/util/pki-util.spec b/pki/linux/util/pki-util.spec
index 66a6ad8d2..ee1568b58 100644
--- a/pki/linux/util/pki-util.spec
+++ b/pki/linux/util/pki-util.spec
@@ -33,7 +33,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      6
+%define base_release      7
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -46,7 +46,7 @@
 %define javadoc_group     Development/Documentation
 
 ## Helper Definitions
-%define pki_jdk           java-1.5.0-ibm-devel >= 1.5.0.3
+%define pki_jdk           java-devel >= 1.6.0
 %define pki_ca            %{base_entity} Certificate Authority
 %define pki_drm           %{base_entity} Data Recovery Manager
 %define pki_ds            Fedora Directory Server
@@ -66,14 +66,14 @@
 ## Bugzilla Bug #246173:  The following section is necessary due to
 ## Bugzilla Bug #232224 and is related to using the IBM JDK with a
 ## specific version of glibc on specific platforms on specific architectures
-%ifarch x86_64
+#%ifarch x86_64
 #export LD_PRELOAD=/usr/lib/jvm/java-1.5.0-ibm-1.5.0.3.x86_64/jre/bin/libj9vm23.so:/usr/lib/jvm/java-1.5.0-ibm-1.5.0.3.x86_64/jre/bin/libj9thr23.so:/usr/lib/jvm/java-1.5.0-ibm-1.5.0.3.x86_64/jre/bin/libjsig.so
-%endif
+#%endif
 
 ## 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}
@@ -84,12 +84,12 @@
 %define openjdk           %(test %{dist_version} -ge 9 && echo 1 || echo 0)
 %if %{openjdk}
 ## redefine the JDK used to build on Fedora 9 Linux
-%define pki_jdk           java-sdk >= 1.6.0
+%define pki_jdk           java-devel >= 1.6.0
 %endif
 %define openjdk           %(test %{dist_version} -eq 8 && echo 1 || echo 0)
 %if %{openjdk}
 ## redefine the JDK used to build on Fedora 8 Linux
-%define pki_jdk           java-sdk >= 1.7.0
+%define pki_jdk           java-devel >= 1.7.0
 %endif
 %else
 %define is_redhat         %(test -e /etc/redhat-release && echo 1 || echo 0)
@@ -278,6 +278,10 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Sat Nov 22 2008 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-7
+- 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
 * Fri Oct 9 2008 Ade Lee <alee@redhat.com> 1.0.0-6
 - Fix for bug #223361: Security Domain in LDAP
 * Tue Sep 16 2008 Christina Fu <cfu@redhat.com> 1.0.0-5