Updated release number to 10.3.3-1

4 files changed, 26 insertions, 24 deletions

diff --git a/specs/dogtag-pki-theme.spec b/specs/dogtag-pki-theme.spec
index 0c0a0b202..496631e1a 100644
--- a/specs/dogtag-pki-theme.spec
+++ b/specs/dogtag-pki-theme.spec
@@ -1,6 +1,6 @@
 Name:             dogtag-pki-theme
 Version:          10.3.3
-Release:          0.1%{?dist}
+Release:          1%{?dist}
 Summary:          Certificate System - Dogtag PKI Theme Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -11,12 +11,7 @@ BuildArch:        noarch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake
-%if 0%{?rhel}
-# HACK:  RHEL builds currently suppress 'Provides: java-devel' . . .
 BuildRequires:    java-1.8.0-openjdk-devel
-%else
-BuildRequires:    java-devel >= 1:1.8.0
-%endif
 BuildRequires:    jpackage-utils >= 1.7.5-10
 
 %if 0%{?rhel}
@@ -96,7 +91,7 @@ This package is used by the Dogtag Certificate System.
 Summary:          Certificate System - PKI Console User Interface
 Group:            System Environment/Base
 
-Requires:         java >= 1:1.8.0
+Requires:         java-1.8.0-openjdk
 
 %if 0%{?rhel}
 # EPEL version of Dogtag "theme" conflicts with all versions of Red Hat "theme"
@@ -164,6 +159,9 @@ cd build
 
 
 %changelog
+* Mon Jun 20 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-1
+- Updated release number to 10.3.3-1
+
 * Tue Jun  7 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-0.1
 - Updated version number to 10.3.3-0.1
 
diff --git a/specs/dogtag-pki.spec b/specs/dogtag-pki.spec
index 22f3d193c..971ec4172 100644
--- a/specs/dogtag-pki.spec
+++ b/specs/dogtag-pki.spec
@@ -7,7 +7,7 @@
 Summary:          Dogtag Public Key Infrastructure (PKI) Suite
 Name:             dogtag-pki
 Version:          10.3.3
-Release:          0.1%{?dist}
+Release:          1%{?dist}
 # The entire source code is GPLv2 except for 'pki-tps' which is LGPLv2
 License:          GPLv2 and LGPLv2
 URL:              http://pki.fedoraproject.org/
@@ -124,6 +124,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Mon Jun 20 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-1
+- Updated release number to 10.3.3-1
+
 * Tue Jun  7 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-0.1
 - Updated version number to 10.3.3-0.1
 
diff --git a/specs/pki-console.spec b/specs/pki-console.spec
index 672cfcb72..5a3a63351 100644
--- a/specs/pki-console.spec
+++ b/specs/pki-console.spec
@@ -1,6 +1,6 @@
 Name:             pki-console
 Version:          10.3.3
-Release:          0.1%{?dist}
+Release:          1%{?dist}
 Summary:          Certificate System - PKI Console
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -21,12 +21,7 @@ BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:    cmake >= 2.8.9-1
 BuildRequires:    idm-console-framework
-%if 0%{?rhel}
-# HACK:  RHEL builds currently suppress 'Provides: java-devel' . . .
 BuildRequires:    java-1.8.0-openjdk-devel
-%else
-BuildRequires:    java-devel >= 1:1.8.0
-%endif
 BuildRequires:    ldapjdk
 BuildRequires:    nspr-devel
 BuildRequires:    nss-devel
@@ -36,7 +31,7 @@ BuildRequires:    jss >= 4.2.6-40
 BuildRequires:    pki-base-java >= %{pki_core_version}
 
 Requires:         idm-console-framework
-Requires:         java >= 1:1.8.0
+Requires:         java-1.8.0-openjdk
 Requires:         ldapjdk
 Requires:         pki-base-java >= %{pki_core_version}
 Requires:         pki-console-theme >= %{version}
@@ -103,6 +98,9 @@ cd build
 
 
 %changelog
+* Mon Jun 20 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-1
+- Updated release number to 10.3.3-1
+
 * Tue Jun  7 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-0.1
 - Updated version number to 10.3.3-0.1
 
diff --git a/specs/pki-core.spec b/specs/pki-core.spec
index 5574c8399..d432de924 100644
--- a/specs/pki-core.spec
+++ b/specs/pki-core.spec
@@ -58,7 +58,7 @@
 
 Name:             pki-core
 Version:          10.3.3
-Release:          0.1%{?dist}
+Release:          1%{?dist}
 Summary:          Certificate System - PKI Core Components
 URL:              http://pki.fedoraproject.org/
 License:          GPLv2
@@ -338,7 +338,7 @@ Requires:         apache-commons-io
 Requires:         apache-commons-lang
 Requires:         apache-commons-logging
 Requires:         jakarta-commons-httpclient
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 Requires:         javassist
 Requires:         jpackage-utils >= 0:1.7.5-10
 Requires:         jss >= 4.2.6-40
@@ -420,7 +420,7 @@ Obsoletes:        pki-java-tools < %{version}-%{release}
 Requires:         openldap-clients
 Requires:         nss
 Requires:         nss-tools
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 Requires:         pki-base = %{version}-%{release}
 Requires:         pki-base-java = %{version}-%{release}
 Requires:         jpackage-utils >= 0:1.7.5-10
@@ -457,7 +457,7 @@ Obsoletes:        pki-deploy < %{version}-%{release}
 Obsoletes:        pki-setup < %{version}-%{release}
 Obsoletes:        pki-silent < %{version}-%{release}
 
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 Requires:         net-tools
 
 Requires:         python-ldap
@@ -540,7 +540,7 @@ Group:            System Environment/Daemons
 
 BuildArch:        noarch
 
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 Requires:         pki-server = %{version}-%{release}
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
@@ -567,7 +567,7 @@ Group:            System Environment/Daemons
 
 BuildArch:        noarch
 
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 Requires:         pki-server = %{version}-%{release}
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
@@ -600,7 +600,7 @@ Group:            System Environment/Daemons
 
 BuildArch:        noarch
 
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 %if 0%{?package_fedora_packages} || 0%{?package_rhel_packages}
 Requires:         pki-server = %{version}-%{release}
 %else
@@ -644,7 +644,7 @@ Group:            System Environment/Daemons
 
 BuildArch:        noarch
 
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 %if 0%{?package_fedora_packages} || 0%{?package_rhel_packages}
 Requires:         pki-server = %{version}-%{release}
 Requires:         pki-symkey = %{version}-%{release}
@@ -688,7 +688,7 @@ Provides:         pki-tps-client
 Obsoletes:        pki-tps-tomcat
 Obsoletes:        pki-tps-client
 
-Requires:         java-headless >= 1:1.8.0
+Requires:         java-1.8.0-openjdk-headless
 %if 0%{?package_fedora_packages} || 0%{?package_rhel_packages}
 Requires:         pki-server = %{version}-%{release}
 %else
@@ -1172,6 +1172,9 @@ systemctl daemon-reload
 %endif # %{with server}
 
 %changelog
+* Mon Jun 20 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-1
+- Updated release number to 10.3.3-1
+
 * Tue Jun  7 2016 Dogtag Team <pki-devel@redhat.com> 10.3.3-0.1
 - Updated version number to 10.3.3-0.1