!38 Fix EulerMaker build failure
From: @wang--ge Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
e78b2ddfe8
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: pki-core
|
Name: pki-core
|
||||||
Version: 10.7.3
|
Version: 10.7.3
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: The PKI Core Package
|
Summary: The PKI Core Package
|
||||||
License: GPLv2 and LGPLv2
|
License: GPLv2 and LGPLv2
|
||||||
URL: http://www.dogtagpki.org/
|
URL: http://www.dogtagpki.org/
|
||||||
@ -63,7 +63,8 @@ Summary: The PKI Python 3 Package
|
|||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Obsoletes: pki-base-python3 < %{version}
|
Obsoletes: pki-base-python3 < %{version}
|
||||||
Provides: pki-base-python3 = %{version}
|
Provides: pki-base-python3 = %{version}
|
||||||
%{?python_provide:%python_provide python3-pki}
|
Provides: python3-pki = %{version}
|
||||||
|
Provides: python-pki = %{version}
|
||||||
Requires: pki-base = %{version} python3-cryptography python3-lxml
|
Requires: pki-base = %{version} python3-cryptography python3-lxml
|
||||||
Requires: python3-requests >= 2.6.0 python3-six python3-nss
|
Requires: python3-requests >= 2.6.0 python3-six python3-nss
|
||||||
%description -n python3-pki
|
%description -n python3-pki
|
||||||
@ -216,9 +217,9 @@ else
|
|||||||
app_server=tomcat-$tomcat_version
|
app_server=tomcat-$tomcat_version
|
||||||
fi
|
fi
|
||||||
# generate go-md2man
|
# generate go-md2man
|
||||||
mkdir -p /home/abuild/rpmbuild/bin/
|
mkdir -p ~/rpmbuild/bin/
|
||||||
cd go-md2man-*
|
cd go-md2man-*
|
||||||
go build -mod=vendor -o /home/abuild/rpmbuild/bin/
|
go build -mod=vendor -o ~/rpmbuild/bin/
|
||||||
cd -
|
cd -
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
cd build
|
cd build
|
||||||
@ -238,7 +239,7 @@ cd build
|
|||||||
..
|
..
|
||||||
|
|
||||||
%install
|
%install
|
||||||
export PATH=$PATH:/home/abuild/rpmbuild/bin/
|
export PATH=$PATH:~/rpmbuild/bin/
|
||||||
cd build
|
cd build
|
||||||
%make_build \
|
%make_build \
|
||||||
VERBOSE=%{?_verbose} CMAKE_NO_VERBOSE=1 \
|
VERBOSE=%{?_verbose} CMAKE_NO_VERBOSE=1 \
|
||||||
@ -439,6 +440,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 17 2023 Ge Wang <wang__ge@126.com> - 10.7.3-6
|
||||||
|
- Fix EulerMaker build failure caused by build root difference
|
||||||
|
|
||||||
* Wed Jun 28 2023 wangkai <13474090681@163.com> - 10.7.3-5
|
* Wed Jun 28 2023 wangkai <13474090681@163.com> - 10.7.3-5
|
||||||
- Fix CVE-2022-2414
|
- Fix CVE-2022-2414
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user