Rebase to JSS v4.7.3
Signed-off-by: Alexander Scheel <ascheel@redhat.com>
This commit is contained in:
parent
1aaa108158
commit
8d0f659a7b
1
.gitignore
vendored
1
.gitignore
vendored
@ -29,3 +29,4 @@ jss-4.2.6.tar.gz
|
|||||||
/jss-4.7.0-b4.tar.gz
|
/jss-4.7.0-b4.tar.gz
|
||||||
/jss-4.7.0.tar.gz
|
/jss-4.7.0.tar.gz
|
||||||
/jss-4.7.2.tar.gz
|
/jss-4.7.2.tar.gz
|
||||||
|
/jss-4.7.3.tar.gz
|
||||||
|
18
jss.spec
18
jss.spec
@ -6,7 +6,7 @@ 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.7.2
|
Version: 4.7.3
|
||||||
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
|
Release: 1%{?_timestamp}%{?_commit_id}%{?dist}
|
||||||
#global _phase -a1
|
#global _phase -a1
|
||||||
|
|
||||||
@ -108,13 +108,26 @@ export CFLAGS
|
|||||||
# Check if we're in FIPS mode
|
# Check if we're in FIPS mode
|
||||||
modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
|
modutil -dbdir /etc/pki/nssdb -chkfips true | grep -q enabled && export FIPS_ENABLED=1
|
||||||
|
|
||||||
|
# RHEL's CMake doesn't support -B flag.
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%{__mkdir_p} %{_vpath_builddir}
|
||||||
|
cd %{_vpath_builddir}
|
||||||
|
%endif
|
||||||
|
|
||||||
# The Makefile is not thread-safe
|
# The Makefile is not thread-safe
|
||||||
%cmake \
|
%cmake \
|
||||||
-DJAVA_HOME=%{java_home} \
|
-DJAVA_HOME=%{java_home} \
|
||||||
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
|
-DJAVA_LIB_INSTALL_DIR=%{_jnidir} \
|
||||||
|
%if 0%{?rhel}
|
||||||
|
..
|
||||||
|
%else
|
||||||
-B %{_vpath_builddir}
|
-B %{_vpath_builddir}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?fedora}
|
||||||
cd %{_vpath_builddir}
|
cd %{_vpath_builddir}
|
||||||
|
%endif
|
||||||
|
|
||||||
%{__make} all
|
%{__make} all
|
||||||
%{__make} javadoc
|
%{__make} javadoc
|
||||||
ctest --output-on-failure
|
ctest --output-on-failure
|
||||||
@ -160,6 +173,9 @@ cp -p *.txt $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
|
|||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Sep 11 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.3-1
|
||||||
|
- Rebase to upstream stable release JSS v4.7.3
|
||||||
|
|
||||||
* Tue Aug 18 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.2-1
|
* Tue Aug 18 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.7.2-1
|
||||||
- Rebase to upstream stable release JSS v4.7.2 ; fixes FTBFS
|
- Rebase to upstream stable release JSS v4.7.2 ; fixes FTBFS
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (jss-4.7.2.tar.gz) = 171b4c341b56c49eaedf0663cee7c949bd91f070781debc80b7b74f85eeacc5e4092cc5ab8eb3ace926493a7ea64d08c5c7a614dccd2e479f8b371b6075d6594
|
SHA512 (jss-4.7.3.tar.gz) = 9358cf78d99e5e32a07dd457d6b0c916bdf9bf6959efe889f1cb91af75aa79fc419c2d057a40bfbe4e2a4924bffc1cafa04d917622cafe07062bcb633f330f98
|
||||||
|
Loading…
Reference in New Issue
Block a user