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/jss.git#049ad39b72d847664f925f54073e15ad66d0d3de
This commit is contained in:
DistroBaker 2021-01-14 14:40:53 +00:00
parent e988e634ce
commit 42e0b33f99
3 changed files with 9 additions and 5 deletions

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ jss-4.2.6.tar.gz
/jss-4.7.3.tar.gz
/jss-4.8.0-b1.tar.gz
/jss-4.8.0.tar.gz
/jss-4.8.1.tar.gz

View File

@ -6,8 +6,8 @@ Summary: Java Security Services (JSS)
URL: http://www.dogtagpki.org/wiki/JSS
License: MPLv1.1 or GPLv2+ or LGPLv2+
Version: 4.8.0
Release: 2%{?_timestamp}%{?_commit_id}%{?dist}
Version: 4.8.1
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
#global _phase -a1
# To generate the source tarball:
@ -33,7 +33,7 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
# autosetup
BuildRequires: git
BuildRequires: make
BuildRequires: cmake
BuildRequires: cmake >= 3.14
BuildRequires: zip
BuildRequires: unzip
@ -68,7 +68,7 @@ Requires: apache-commons-lang3
Conflicts: ldapjdk < 4.20
Conflicts: idm-console-framework < 1.2
Conflicts: tomcatjss < 7.3.4
Conflicts: tomcatjss < 7.6.0
Conflicts: pki-base < 10.10.0
%description
@ -160,6 +160,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
################################################################################
%changelog
* Thu Jan 14 2021 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.1-1
- Rebase to upstream stable JSS v4.8.1
* Thu Nov 05 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.8.0-2
- Add Conflicts on older PKI versions due to missing ACL3

View File

@ -1 +1 @@
SHA512 (jss-4.8.0.tar.gz) = 322d12b69a2665a4ea2302a9a3ba8668c8dd6b56e6aaa17b48e11885ebcb9b38663242312207a0452c95bd84306bab4e968a8d0a1444dea003e4d19e43f6f425
SHA512 (jss-4.8.1.tar.gz) = d18ef995cba627de68077bbd8dc25640b6444c4674e29ec83a05296ac1f18289e1ada35229baafbf5c5e4f1ae712a46e48d9d6dcead935e0f4d3d72b5208cf40