remove conflicts tomcat-native

(cherry picked from commit ffad5559ae5901f19073c19f7cd4ebcf29b68b3e)
This commit is contained in:
caodongxia 2022-02-09 16:19:33 +08:00 committed by openeuler-sync-bot
parent b4d69efdcc
commit 87f9a05747

View File

@ -4,13 +4,13 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+
BuildArch: noarch
Version: 7.4.1
Release: 4
Release: 5
Source: https://github.com/dogtagpki/tomcatjss/archive/v%{version}%{?_phase}/tomcatjss-%{version}%{?_phase}.tar.gz
Patch0: Use-JSSKeyManager-and-JSSTrustManager-from-JSS.patch
BuildRequires: git ant apache-commons-lang java-devel jpackage-utils >= 0:1.7.5-15 slf4j
BuildRequires: slf4j-jdk14 jss >= 4.6.0 tomcat >= 1:9.0.7
Requires: apache-commons-lang java-headless jpackage-utils >= 0:1.7.5-15 slf4j jss >= 4.6.0 tomcat >= 1:9.0.7
Conflicts: tomcat-native pki-base < 10.6.5
Conflicts: pki-base < 10.6.5
%define _sharedstatedir /var/lib
%description
@ -37,6 +37,9 @@ ant -f build.xml -Dversion=%{version} -Dsrc.dir=$app_server -Djnidir=%{_jnidir}
%{_javadir}/*
%changelog
* Wed Feb 09 2022 caodongxia <caodongxia@huawei.com> - 7.4.1-5
- Remove conflicts tomcat-native
* Tue Dec 07 2021 wangkai <wangkai385@huawei.com> - 7.4.1-4
- Remove conflicts tomcat-native