From 5d379d014133c7bafeb3e7afab64c8686f208f68 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 18 Jun 2021 19:14:04 -0500 Subject: [PATCH] Rebase to TomcatJSS 8.0.0-alpha1 --- .gitignore | 1 + sources | 2 +- tomcatjss.spec | 120 +++++++++---------------------------------------- 3 files changed, 22 insertions(+), 101 deletions(-) diff --git a/.gitignore b/.gitignore index fc01b9f..8fce6da 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ tomcatjss-1.2.0.tar.gz /tomcatjss-7.5.0.tar.gz /tomcatjss-7.6.0.tar.gz /tomcatjss-7.6.1.tar.gz +/tomcatjss-8.0.0-alpha1.tar.gz diff --git a/sources b/sources index aa1efdb..f29684b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (tomcatjss-7.6.1.tar.gz) = 3945475d53a21aa680efe87ae71523692f9441bf820b9d9680b1f5b1bda53bdf628ab4edd4f4af2c40a778a529b72a45f16f5dcbd92d87ae7c999b190b8c0059 +SHA512 (tomcatjss-8.0.0-alpha1.tar.gz) = 8a81631fedf593f27fb4343737300eef28f42dc6d7efca56a726a77c6523adbace52fd56f074fedadfbba1e5110228da60182835d7f1a4c219bd29c926fbe7b9 diff --git a/tomcatjss.spec b/tomcatjss.spec index 1d6a9f4..fcbcc56 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -7,9 +7,11 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS License: LGPLv2+ BuildArch: noarch -Version: 7.6.1 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} -#global _phase -a1 +# For development (i.e. unsupported) releases, use x.y.z-0.n.. +# For official (i.e. supported) releases, use x.y.z-r where r >=1. +Version: 8.0.0 +Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -alpha1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/tomcatjss.git @@ -28,6 +30,14 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_ # > tomcatjss-VERSION-RELEASE.patch # Patch: tomcatjss-VERSION-RELEASE.patch +################################################################################ +# Java +################################################################################ + +%define java_devel java-11-openjdk-devel +%define java_headless java-11-openjdk-headless +%define java_home /usr/lib/jvm/jre-11-openjdk + ################################################################################ # Build Dependencies ################################################################################ @@ -39,7 +49,7 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_ # Java BuildRequires: ant BuildRequires: apache-commons-lang3 -BuildRequires: java-devel +BuildRequires: %{java_devel} BuildRequires: jpackage-utils >= 0:1.7.5-15 # SLF4J @@ -47,7 +57,7 @@ BuildRequires: slf4j BuildRequires: slf4j-jdk14 # JSS -BuildRequires: jss >= 4.8.0 +BuildRequires: jss >= 5.0.0 # Tomcat %if 0%{?rhel} && ! 0%{?eln} @@ -62,11 +72,7 @@ BuildRequires: tomcat >= 1:9.0.7 # Java Requires: apache-commons-lang3 -%if 0%{?fedora} >= 21 -Requires: java-headless -%else -Requires: java -%endif +Requires: %{java_headless} Requires: jpackage-utils >= 0:1.7.5-15 # SLF4J @@ -74,7 +80,7 @@ Requires: slf4j Requires: slf4j-jdk14 # JSS -Requires: jss >= 4.8.0 +Requires: jss >= 5.0.0 # Tomcat %if 0%{?rhel} && ! 0%{?eln} @@ -110,12 +116,7 @@ Services (NSS). # get Tomcat . version number tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'` - -if [ $tomcat_version == "9.0" ]; then - app_server=tomcat-8.5 -else - app_server=tomcat-$tomcat_version -fi +app_server=tomcat-$tomcat_version ant -f build.xml \ -Dversion=%{version} \ @@ -138,86 +139,5 @@ ant -f build.xml \ ################################################################################ %changelog -* Wed May 26 2021 Dogtag PKI Team - 7.6.1-3 -- Drop git dependency - -* Wed Jan 27 2021 Fedora Release Engineering - 7.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Dogtag PKI Team - 7.6.1-1 -- Rebase to latest stable release v7.6.1 - -* Thu Dec 10 2020 Merlin Mathesius - 7.6.0-3 -- Minor conditional updates to SPEC so package will build for ELN - -* Thu Nov 05 2020 Dogtag PKI Team - 7.6.0-2 -- Conflict with older PKI versions due to ACL3 - -* Wed Oct 21 2020 Dogtag PKI Team - 7.6.0-1 -- Rebase to match latest upstream stable version v7.6.0 - -* Wed Jul 29 2020 Fedora Release Engineering - 7.5.0-0.6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 7.5.0-0.5 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jun 10 2020 Dogtag PKI Team - 7.5.0-0.4 -- Rebase to match latest upstream version v7.5.0-b2 - -* Wed Jun 10 2020 Dogtag PKI Team - 7.5.0-0.1 -- Rebase to match latest upstream version v7.5.0-a1 -- Make TomcatJSS use both SunJSSE and Mozilla-JSS - -* Fri Jan 31 2020 Fedora Release Engineering - 7.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Aug 08 2019 Dogtag PKI Team - 7.4.1-2 -- Bumping min requirement for jss to 4.6.0 - -* Thu Aug 08 2019 Dogtag PKI Team - 7.4.1-1 -- Rebased to TomcatJSS 7.4.1 - -* Sat Jul 27 2019 Fedora Release Engineering - 7.4.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 06 2019 Dogtag PKI Team - 7.4.0-1 -- Rebased to TomcatJSS 7.4.0 - -* Mon May 06 2019 Dogtag PKI Team - 7.3.7-1 -- Rebased to Tomcatjss 7.3.7 - -* Sun Feb 03 2019 Fedora Release Engineering - 7.3.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Oct 03 2018 Dogtag PKI Team 7.3.6-1 -- Rebased to TomcatJSS 7.3.6 - -* Mon Aug 13 2018 Dogtag PKI Team 7.3.5-1 -- Rebased to TomcatJSS 7.3.5 - -* Tue Aug 07 2018 Dogtag PKI Team 7.3.4-1 -- Rebased to TomcatJSS 7.3.4 - -* Tue Aug 07 2018 Dogtag PKI Team 7.3.3-2 -- Red Hat Bugzilla #1612063 - Do not override system crypto policy (support TLS 1.3) - -* Fri Jul 20 2018 Dogtag PKI Team 7.3.3-1 -- Rebased to TomcatJSS 7.3.3 - -* Sat Jul 14 2018 Fedora Release Engineering - 7.3.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Dogtag PKI Team 7.3.2-1 -- Rebased to TomcatJSS 7.3.2 - -* Fri Jun 15 2018 Dogtag PKI Team 7.3.1-1 -- Fixed Tomcat dependencies -- Rebased to TomcatJSS 7.3.1 - -* Thu Apr 12 2018 Dogtag PKI Team 7.3.0-1 -- Cleaned up spec file -- Rebased to TomcatJSS 7.3.0 final - -* Thu Mar 15 2018 Dogtag PKI Team 7.3.0-0.2 -- Rebased to TomcatJSS 7.3.0 beta +* Tue Jun 22 2021 Dogtag PKI Team - 8.0.0-0.1 +- Rebase to TomcatJSS 8.0.0-alpha1