!10 add buildrequires of gdb; build without test

Merge pull request !10 from guoxiaoqi/next
This commit is contained in:
openeuler-ci-bot 2020-03-21 21:52:44 +08:00 committed by Gitee
commit 83cdbe0d37

View File

@ -7,10 +7,12 @@
%global dracut_modules_dir %{dracutlibdir}/modules.d/05nss-softokn/ %global dracut_modules_dir %{dracutlibdir}/modules.d/05nss-softokn/
%global dracut_conf_dir %{dracutlibdir}/dracut.conf.d %global dracut_conf_dir %{dracutlibdir}/dracut.conf.d
%bcond_with test
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: %{nss_version} Version: %{nss_version}
Release: 9 Release: 11
License: MPLv2.0 License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Provides: nss-system-init Provides: nss-system-init
@ -18,7 +20,7 @@ Requires: nspr >= %{nspr_version} nss-util >= %{nss_version} nss-softokn
Requires: p11-kit-trust crypto-policies nss-help Requires: p11-kit-trust crypto-policies nss-help
Requires(post): coreutils, sed Requires(post): coreutils, sed
BuildRequires: nspr-devel >= %{nspr_version} nss-softokn sqlite-devel zlib-devel BuildRequires: nspr-devel >= %{nspr_version} nss-softokn sqlite-devel zlib-devel
BuildRequires: pkgconf gawk psmisc perl-interpreter gcc-c++ BuildRequires: pkgconf gawk psmisc perl-interpreter gcc-c++ gdb
obsoletes: nss-sysinit < %{version}-%{release} obsoletes: nss-sysinit < %{version}-%{release}
Source0: https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_40_1_RTM/src/%{name}-%{nss_version}.tar.gz Source0: https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_40_1_RTM/src/%{name}-%{nss_version}.tar.gz
@ -214,6 +216,7 @@ cp ./nss/lib/ckfw/nssck.api ./dist/private/nss/
date +"%e %B %Y" | tr -d '\n' > date.xml date +"%e %B %Y" | tr -d '\n' > date.xml
echo -n %{version} > version.xml echo -n %{version} > version.xml
%if %{with test}
%check %check
export FREEBL_NO_DEPEND=1 export FREEBL_NO_DEPEND=1
@ -290,6 +293,8 @@ else
fi fi
echo "test suite completed" echo "test suite completed"
%endif
%install %install
mkdir -p $RPM_BUILD_ROOT/%{_includedir}/nss3/templates mkdir -p $RPM_BUILD_ROOT/%{_includedir}/nss3/templates
@ -540,6 +545,9 @@ update-crypto-policies
%doc %{_mandir}/man* %doc %{_mandir}/man*
%changelog %changelog
* Sat Mar 21 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.40.1-11
- add BuildRequires of gdb; build without test
* Tue Feb 18 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.40.1-10 * Tue Feb 18 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.40.1-10
- fix build error about setup-nsssysinit.sh - fix build error about setup-nsssysinit.sh