packages/tomcatjss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!13 [sync] PR-12: remove conflicts tomcat-native

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @overweight 
Signed-off-by: @overweight
This commit is contained in:
openeuler-ci-bot 2022-03-02 11:13:52 +00:00 committed by Gitee
commit 8b50012856
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tomcatjss.spec
View File

@ -4,13 +4,13 @@ URL: http://www.dogtagpki.org/wiki/TomcatJSS
License: LGPLv2+ License: LGPLv2+
BuildArch: noarch BuildArch: noarch
Version: 7.4.1 Version: 7.4.1
Release: 4 Release: 5
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}/tomcatjss-%{version}%{?_phase}.tar.gz
Patch0: Use-JSSKeyManager-and-JSSTrustManager-from-JSS.patch 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: 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 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 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 %define _sharedstatedir /var/lib
%description %description
@ -37,6 +37,9 @@ ant -f build.xml -Dversion=%{version} -Dsrc.dir=$app_server -Djnidir=%{_jnidir}
%{_javadir}/* %{_javadir}/*
%changelog %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 * Tue Dec 07 2021 wangkai <wangkai385@huawei.com> - 7.4.1-4
- Remove conflicts tomcat-native - Remove conflicts tomcat-native