import tomcatjss-8.2.0-1.el9

This commit is contained in:
CentOS Sources 2022-11-15 01:30:43 -05:00 committed by Stepan Oksanichenko
parent 9e1785bcc4
commit 5c41e62f33
3 changed files with 81 additions and 32 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/tomcatjss-8.0.0.tar.gz
SOURCES/tomcatjss-8.2.0.tar.gz

View File

@ -1 +1 @@
32ac2982d6f8628462a34723d68297371e7c69be SOURCES/tomcatjss-8.0.0.tar.gz
c0d87b43c504ca06dec58ae9cc9008366f4689ab SOURCES/tomcatjss-8.2.0.tar.gz

View File

@ -2,16 +2,33 @@
Name: tomcatjss
################################################################################
%global product_id idm-tomcatjss
# Upstream version number:
%global major_version 8
%global minor_version 2
%global update_version 0
# Downstream release number:
# - development/stabilization (unsupported): 0.<n> where n >= 1
# - GA/update (supported): <n> where n >= 1
%global release_number 1
# Development phase:
# - development (unsupported): alpha<n> where n >= 1
# - stabilization (unsupported): beta<n> where n >= 1
# - GA/update (supported): <none>
%undefine phase
%undefine timestamp
%undefine commit_id
Summary: JSS Connector for Apache Tomcat
URL: http://www.dogtagpki.org/wiki/TomcatJSS
URL: https://github.com/dogtagpki/tomcatjss
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: %{major_version}.%{minor_version}.%{update_version}
Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}
# To generate the source tarball:
# $ git clone https://github.com/dogtagpki/tomcatjss.git
@ -21,7 +38,7 @@ Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
# --prefix tomcatjss-VERSION/ \
# -o tomcatjss-VERSION.tar.gz \
# <version tag>
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?phase:-}%{?phase}/tomcatjss-%{version}%{?phase:-}%{?phase}.tar.gz
# To create a patch for all changes since a version tag:
# $ git format-patch \
@ -34,9 +51,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 +74,7 @@ BuildRequires: slf4j
BuildRequires: slf4j-jdk14
# JSS
BuildRequires: jss >= 5.0.0
BuildRequires: jss >= 5.2.0
# Tomcat
%if 0%{?rhel} && ! 0%{?eln}
@ -66,10 +83,18 @@ BuildRequires: pki-servlet-engine >= 1:9.0.7
BuildRequires: tomcat >= 1:9.0.7
%endif
%description
JSS Connector for Apache Tomcat, installed via the tomcatjss package,
is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
uses Java Security Services (JSS), a Java interface to Network Security
Services (NSS).
################################################################################
# Runtime Dependencies
%package -n %{product_id}
################################################################################
Summary: JSS Connector for Apache Tomcat
# Java
Requires: apache-commons-lang3
Requires: %{java_headless}
@ -80,7 +105,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 +114,9 @@ Requires: pki-servlet-engine >= 1:9.0.7
Requires: tomcat >= 1:9.0.7
%endif
Obsoletes: tomcatjss < %{version}-%{release}
Provides: tomcatjss = %{version}-%{release}
# PKI
Conflicts: pki-base < 10.10.0
@ -98,7 +126,7 @@ Conflicts: pki-base < 10.10.0
%define _sharedstatedir /var/lib
%endif
%description
%description -n %{product_id}
JSS Connector for Apache Tomcat, installed via the tomcatjss package,
is a Java Secure Socket Extension (JSSE) module for Apache Tomcat that
uses Java Security Services (JSS), a Java interface to Network Security
@ -108,27 +136,38 @@ Services (NSS).
%prep
################################################################################
%autosetup -n tomcatjss-%{version}%{?_phase} -p 1
%autosetup -n tomcatjss-%{version}%{?phase:-}%{?phase} -p 1
################################################################################
%build
################################################################################
export JAVA_HOME=%{java_home}
./build.sh \
%{?_verbose:-v} \
--name=%{product_id} \
--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=%{product_id} \
--work-dir=%{_vpath_builddir} \
--version=%{version} \
--java-dir=%{_javadir} \
--doc-dir=%{_docdir} \
--install-dir=%{buildroot} \
install
################################################################################
%files
%files -n %{product_id}
################################################################################
%license LICENSE
@ -140,12 +179,22 @@ ant -f build.xml \
################################################################################
%changelog
* Thu Jun 30 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-1
- Rebase to Tomcat JSS 8.2.0
* Mon May 02 2022 Red Hat PKI Team <rhcs-maint@redhat.com> - 8.2.0-0.3.beta2
- Rebase to Tomcat JSS 8.2.0-beta2
- Rename packages to idm-tomcatjss
* 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