Rebase to upstream JSS v4.6.1
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
parent
95ed694df0
commit
e672bfd04d
1
.gitignore
vendored
1
.gitignore
vendored
@ -21,3 +21,4 @@ jss-4.2.6.tar.gz
|
|||||||
/jss-4.5.1.tar.gz
|
/jss-4.5.1.tar.gz
|
||||||
/jss-4.5.2.tar.gz
|
/jss-4.5.2.tar.gz
|
||||||
/jss-4.5.3.tar.gz
|
/jss-4.5.3.tar.gz
|
||||||
|
/jss-4.6.1.tar.gz
|
||||||
|
24
jss.spec
24
jss.spec
@ -6,18 +6,17 @@ Summary: Java Security Services (JSS)
|
|||||||
URL: http://www.dogtagpki.org/wiki/JSS
|
URL: http://www.dogtagpki.org/wiki/JSS
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
|
|
||||||
Version: 4.5.3
|
Version: 4.6.1
|
||||||
Release: 3%{?_timestamp}%{?_commit_id}%{?dist}
|
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
|
||||||
# global _phase -a1
|
# global _phase -a1
|
||||||
|
|
||||||
# To generate the source tarball:
|
# To generate the source tarball:
|
||||||
# $ git clone https://github.com/dogtagpki/jss.git
|
# $ git clone https://github.com/dogtagpki/jss.git
|
||||||
# $ cd jss
|
# $ cd jss
|
||||||
# $ git archive \
|
# $ git tag v4.5.<z>
|
||||||
# --format=tar.gz \
|
# $ git push origin v4.5.<z>
|
||||||
# --prefix jss-VERSION/ \
|
# Then go to https://github.com/dogtagpki/jss/releases and download the source
|
||||||
# -o jss-VERSION.tar.gz \
|
# tarball.
|
||||||
# <version tag>
|
|
||||||
Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
|
Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phase}/%{name}-%{version}%{?_phase}.tar.gz
|
||||||
|
|
||||||
# To create a patch for all changes since a version tag:
|
# To create a patch for all changes since a version tag:
|
||||||
@ -26,8 +25,6 @@ Source: https://github.com/dogtagpki/%{name}/archive/v%{version}%{?_phas
|
|||||||
# <version tag> \
|
# <version tag> \
|
||||||
# > jss-VERSION-RELEASE.patch
|
# > jss-VERSION-RELEASE.patch
|
||||||
# Patch: jss-VERSION-RELEASE.patch
|
# Patch: jss-VERSION-RELEASE.patch
|
||||||
Patch0: jss-aia-ocsp-1.patch
|
|
||||||
Patch1: jss-aia-ocsp-2.patch
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Build Dependencies
|
# Build Dependencies
|
||||||
@ -108,6 +105,9 @@ export BUILD_OPT=1
|
|||||||
CFLAGS="-g $RPM_OPT_FLAGS"
|
CFLAGS="-g $RPM_OPT_FLAGS"
|
||||||
export CFLAGS
|
export CFLAGS
|
||||||
|
|
||||||
|
# Check if we're in FIPS mode
|
||||||
|
modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
|
||||||
|
|
||||||
# The Makefile is not thread-safe
|
# The Makefile is not thread-safe
|
||||||
rm -rf build && mkdir -p build && cd build
|
rm -rf build && mkdir -p build && cd build
|
||||||
%cmake \
|
%cmake \
|
||||||
@ -115,7 +115,8 @@ rm -rf build && mkdir -p build && cd build
|
|||||||
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
|
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
|
||||||
..
|
..
|
||||||
|
|
||||||
%{__make} all javadoc
|
%{__make} all
|
||||||
|
%{__make} javadoc || true
|
||||||
ctest --output-on-failure
|
ctest --output-on-failure
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
@ -158,6 +159,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 08 2019 Dogtag PKI Team <pki-devel@redhat.com> - 4.6.1-1
|
||||||
|
- Rebase to JSS 4.6.1
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.3-3
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.3-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (jss-4.5.3.tar.gz) = 6a5d5065803a36a42f15c19fa870edf4844d650911c690a8033288ee0e2e6e115868de39a7c9c955e068568a859baf5fb3e8e970b4167dfc19782bb661ab6d71
|
SHA512 (jss-4.6.1.tar.gz) = 7a7eb02e98a22d0817aec34cff32ac942545885c84992812d116b683fa31c12d0fb9b8aa3b8757ab234f9980993fb933d6556c959935cd5e09ca7468d8729c8a
|
||||||
|
Loading…
Reference in New Issue
Block a user