Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tomcatjss.git#aa6b924cb4798583097fc0b93f6b58fd9cab0207
This commit is contained in:
DistroBaker
parent
01468800a3
commit
ec3c4e17ac
|
|
@ -28,3 +28,5 @@ tomcatjss-1.2.0.tar.gz
|
|||
/tomcatjss-7.5.0-a1.tar.gz
|
||||
/tomcatjss-7.5.0-b2.tar.gz
|
||||
/tomcatjss-7.5.0.tar.gz
|
||||
/tomcatjss-7.6.0.tar.gz
|
||||
/tomcatjss-7.6.1.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
From d9e8b91443a89a4493c3c96b979079c2d65c73cd Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Scheel <ascheel@redhat.com>
|
||||
Date: Mon, 17 Aug 2020 19:15:39 -0400
|
||||
Subject: [PATCH] Switch to JDK8 source/target compatibility
|
||||
|
||||
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
|
||||
---
|
||||
build.xml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index 0610cd4..3c945a6 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -20,7 +20,7 @@
|
||||
<project name="tomcatjss" default="main" basedir=".">
|
||||
<!--
|
||||
Give user a chance to override without editing this file
|
||||
- (and without typing -D each time it compiles it)
|
||||
+ (and without typing -D each time it compiles it)
|
||||
-->
|
||||
|
||||
<property file=".ant.properties"/>
|
||||
@@ -217,7 +217,7 @@
|
||||
description="compile the source " >
|
||||
<!-- Compile the java code from ${src} into ${build} -->
|
||||
<mkdir dir="${build.classes}"/>
|
||||
- <javac debug="on" destdir="${build.classes}">
|
||||
+ <javac debug="on" destdir="${build.classes}" source="1.8" target="1.8">
|
||||
<src path="src"/>
|
||||
<src path="${src.dir}"/>
|
||||
<classpath refid="classpath"/>
|
||||
--
|
||||
2.26.2
|
||||
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (tomcatjss-7.5.0.tar.gz) = a8954bc9a820ce429a4bcbfdf756e7c202318bb454ab74e44e39a6bdcdb3dd4dd4ab6916bc1693b5eb55356db6ce4a3358dbf4dcc08bc5a8bc13c1ff95c017f0
|
||||
SHA512 (tomcatjss-7.6.1.tar.gz) = 3945475d53a21aa680efe87ae71523692f9441bf820b9d9680b1f5b1bda53bdf628ab4edd4f4af2c40a778a529b72a45f16f5dcbd92d87ae7c999b190b8c0059
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
|
|||
License: LGPLv2+
|
||||
BuildArch: noarch
|
||||
|
||||
Version: 7.5.0
|
||||
Version: 7.6.1
|
||||
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
|
||||
#global _phase -a1
|
||||
|
||||
|
|
@ -27,7 +27,6 @@ Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_
|
|||
# <version tag> \
|
||||
# > tomcatjss-VERSION-RELEASE.patch
|
||||
# Patch: tomcatjss-VERSION-RELEASE.patch
|
||||
Patch1: 0001-Switch-to-JDK8-source-target-compatibility.patch
|
||||
|
||||
################################################################################
|
||||
# Build Dependencies
|
||||
|
|
@ -42,50 +41,30 @@ BuildRequires: git
|
|||
|
||||
# Java
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-commons-lang
|
||||
BuildRequires: apache-commons-lang3
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: jpackage-utils >= 0:1.7.5-15
|
||||
|
||||
# SLF4J
|
||||
BuildRequires: slf4j
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
# no slf4j-jdk14
|
||||
%else
|
||||
BuildRequires: slf4j-jdk14
|
||||
%endif
|
||||
|
||||
# JSS
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
BuildRequires: jss >= 4.4.0-7
|
||||
%else
|
||||
BuildRequires: jss >= 4.7.0
|
||||
%endif
|
||||
BuildRequires: jss >= 4.8.0
|
||||
|
||||
# Tomcat
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
BuildRequires: tomcat >= 7.0.69
|
||||
%else
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 27
|
||||
BuildRequires: tomcat >= 8.0.49
|
||||
%else
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 28
|
||||
BuildRequires: tomcat >= 1:8.5.23
|
||||
%else
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
BuildRequires: pki-servlet-engine >= 1:9.0.7
|
||||
%else
|
||||
BuildRequires: tomcat >= 1:9.0.7
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
################################################################################
|
||||
# Runtime Dependencies
|
||||
################################################################################
|
||||
|
||||
# Java
|
||||
Requires: apache-commons-lang
|
||||
Requires: apache-commons-lang3
|
||||
%if 0%{?fedora} >= 21
|
||||
Requires: java-headless
|
||||
%else
|
||||
|
|
@ -95,40 +74,20 @@ Requires: jpackage-utils >= 0:1.7.5-15
|
|||
|
||||
# SLF4J
|
||||
Requires: slf4j
|
||||
%if 0%{?rhel}
|
||||
# no slf4j-jdk14
|
||||
%else
|
||||
Requires: slf4j-jdk14
|
||||
%endif
|
||||
|
||||
# JSS
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
Requires: jss >= 4.4.0-7
|
||||
%else
|
||||
Requires: jss >= 4.7.0
|
||||
%endif
|
||||
Requires: jss >= 4.8.0
|
||||
|
||||
# Tomcat
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
Requires: tomcat >= 7.0.69
|
||||
%else
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 27
|
||||
Requires: tomcat >= 8.0.49
|
||||
%else
|
||||
%if 0%{?fedora} && 0%{?fedora} <= 28
|
||||
Requires: tomcat >= 1:8.5.23
|
||||
%else
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} && ! 0%{?eln}
|
||||
Requires: pki-servlet-engine >= 1:9.0.7
|
||||
%else
|
||||
Requires: tomcat >= 1:9.0.7
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
# PKI
|
||||
Conflicts: pki-base < 10.6.5
|
||||
Conflicts: pki-base < 10.10.0
|
||||
|
||||
|
||||
%if 0%{?rhel}
|
||||
|
|
@ -182,6 +141,18 @@ ant -f build.xml \
|
|||
|
||||
################################################################################
|
||||
%changelog
|
||||
* Thu Jan 14 2021 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.1-1
|
||||
- Rebase to latest stable release v7.6.1
|
||||
|
||||
* Thu Dec 10 2020 Merlin Mathesius <mmathesi@redhat.com> - 7.6.0-3
|
||||
- Minor conditional updates to SPEC so package will build for ELN
|
||||
|
||||
* Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.0-2
|
||||
- Conflict with older PKI versions due to ACL3
|
||||
|
||||
* Wed Oct 21 2020 Dogtag PKI Team <pki-devel@redhat.com> - 7.6.0-1
|
||||
- Rebase to match latest upstream stable version v7.6.0
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.0-0.6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue