From ffad5559ae5901f19073c19f7cd4ebcf29b68b3e Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Wed, 9 Feb 2022 16:19:33 +0800 Subject: [PATCH] remove conflicts tomcat-native --- tomcatjss.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tomcatjss.spec b/tomcatjss.spec index 513ce56..e11b784 100644 --- a/tomcatjss.spec +++ b/tomcatjss.spec @@ -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 - 7.4.1-5 +- Remove conflicts tomcat-native + * Tue Dec 07 2021 wangkai - 7.4.1-4 - Remove conflicts tomcat-native -- Gitee