Rebase to Tomcat JSS 8.2.0-beta1

Resolves: #2076398
This commit is contained in:
Endi S. Dewata 2022-04-19 12:48:11 -05:00
parent 460782017f
commit 28dec243ea
3 changed files with 40 additions and 23 deletions

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ tomcatjss-1.2.0.tar.gz
/tomcatjss-7.6.1.tar.gz
/tomcatjss-8.0.0-alpha1.tar.gz
/tomcatjss-8.0.0.tar.gz
/tomcatjss-8.2.0-beta1.tar.gz

View File

@ -1 +1 @@
SHA512 (tomcatjss-8.0.0.tar.gz) = 3d3c978064cf9fc44132fb694565b0bad6c3762a9eb350a753724f465303bd2354a26263b373b0989013f674c728b5eeea0fe2adc5eb6c7864a8164080301df1
SHA512 (tomcatjss-8.2.0-beta1.tar.gz) = 1dd8b48dce35d9f37f8ef10b65d815ae894dc225edbab9d2a4bc229c0ceee6768bbb081ed59fbb50632ed3844e5565329ccf62cc66201bfa1f0149b12fb25372

View File

@ -3,15 +3,15 @@ Name: tomcatjss
################################################################################
Summary: JSS Connector for Apache Tomcat
URL: http://www.dogtagpki.org/wiki/TomcatJSS
URL: https://www.dogtagpki.org/wiki/Tomcat_JSS
License: LGPLv2+
BuildArch: noarch
# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
# For official (i.e. supported) releases, use x.y.z-r where r >=1.
Version: 8.0.0
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -alpha1
Version: 8.2.0
Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist}
%global _phase -beta1
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/tomcatjss.git
@ -34,9 +34,9 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
# Java
################################################################################
%define java_devel java-11-openjdk-devel
%define java_headless java-11-openjdk-headless
%define java_home /usr/lib/jvm/jre-11-openjdk
%define java_devel java-17-openjdk-devel
%define java_headless java-17-openjdk-headless
%define java_home %{_jvmdir}/jre-17-openjdk
################################################################################
# Build Dependencies
@ -57,7 +57,7 @@ BuildRequires: slf4j
BuildRequires: slf4j-jdk14
# JSS
BuildRequires: jss >= 5.0.0
BuildRequires: jss >= 5.2.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@ -80,7 +80,7 @@ Requires: slf4j
Requires: slf4j-jdk14
# JSS
Requires: jss >= 5.0.0
Requires: jss >= 5.2.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@ -89,6 +89,10 @@ Requires: pki-servlet-engine >= 1:9.0.7
Requires: tomcat >= 1:9.0.7
%endif
%if "%{name}" != "tomcatjss"
Provides: tomcatjss = %{version}-%{release}
%endif
# PKI
Conflicts: pki-base < 10.10.0
@ -110,21 +114,30 @@ Services (NSS).
%autosetup -n tomcatjss-%{version}%{?_phase} -p 1
################################################################################
%build
################################################################################
./build.sh \
%{?_verbose:-v} \
--name=%{name} \
--work-dir=%{_vpath_builddir} \
--version=%{version} \
--jni-dir=%{_jnidir} \
dist
################################################################################
%install
################################################################################
# get Tomcat <major>.<minor> version number
tomcat_version=`/usr/sbin/tomcat version | sed -n 's/Server number: *\([0-9]\+\.[0-9]\+\).*/\1/p'`
app_server=tomcat-$tomcat_version
ant -f build.xml \
-Dversion=%{version} \
-Dsrc.dir=$app_server \
-Ddist.dir=%{_vpath_builddir} \
-Djnidir=%{_jnidir} \
-Dinstall.doc.dir=%{buildroot}%{_docdir}/%{name} \
-Dinstall.jar.dir=%{buildroot}%{_javadir} \
./build.sh \
%{?_verbose:-v} \
--name=%{name} \
--work-dir=%{_vpath_builddir} \
--version=%{version} \
--java-dir=%{_javadir} \
--doc-dir=%{_docdir} \
--install-dir=%{buildroot} \
install
################################################################################
@ -140,12 +153,15 @@ ant -f build.xml \
################################################################################
%changelog
* Mon Apr 18 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-0.2.beta1
- Rebase to Tomcat JSS 8.2.0-beta1
* Tue Oct 05 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.0.0-1
- Rebase to TomcatJSS 8.0.0
- Rebase to Tomcat JSS 8.0.0
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 8.0.0-0.2.alpha1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.0.0-0.1
- Rebase to TomcatJSS 8.0.0-alpha1
- Rebase to Tomcat JSS 8.0.0-alpha1