From bce37e844013166916b13a852004cb753628c50a Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 Dec 2021 12:18:15 -0500 Subject: [PATCH] import tomcatjss-8.0.0-1.el9 --- .gitignore | 2 +- .tomcatjss.metadata | 2 +- SPECS/tomcatjss.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ac1df7f..5b7871f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/tomcatjss-8.0.0-alpha1.tar.gz +SOURCES/tomcatjss-8.0.0.tar.gz diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata index 9fc587b..d931071 100644 --- a/.tomcatjss.metadata +++ b/.tomcatjss.metadata @@ -1 +1 @@ -28d40acb817beb56bc8b7e04845002b5f4a290b9 SOURCES/tomcatjss-8.0.0-alpha1.tar.gz +32ac2982d6f8628462a34723d68297371e7c69be SOURCES/tomcatjss-8.0.0.tar.gz diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec index 3e80215..b5ceeb7 100644 --- a/SPECS/tomcatjss.spec +++ b/SPECS/tomcatjss.spec @@ -10,8 +10,8 @@ BuildArch: noarch # 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.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha1 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -alpha1 # To generate the source tarball: # $ git clone https://github.com/dogtagpki/tomcatjss.git @@ -121,6 +121,7 @@ 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} \ @@ -139,6 +140,9 @@ ant -f build.xml \ ################################################################################ %changelog +* Tue Oct 05 2021 Red Hat PKI Team - 8.0.0-1 +- Rebase to TomcatJSS 8.0.0 + * Tue Aug 10 2021 Mohan Boddu - 8.0.0-0.2.alpha1 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688