- added include patch (missing include in <nss/secmodt.h> file)

[packages/nss.git] / nss.spec

diff --git a/nss.spec b/nss.spec
index 33b88466de813c27785605a3becd23ab39bd6b37..194416a50c7235c536ea98f1d30984466a5fce7f 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -1,27 +1,28 @@
 # Conditional build:
+%bcond_with    bootstrap       # avoid dependency on nss-tools
 %bcond_with    tests           # enable tests
 
-%define        nspr_ver        1:4.28
+%define        nspr_ver        1:4.30
 %define        foover  %(echo %{version} | tr . _)
 Summary:       NSS - Network Security Services
 Summary(pl.UTF-8):     NSS - Network Security Services
 Name:          nss
-Version:       3.56
-Release:       1
+Version:       3.67
+Release:       2
 Epoch:         1
 License:       MPL v2.0
 Group:         Libraries
-Source0:       http://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
-# Source0-md5: ec4c24003069d28d5f9cc5c78a30cc5e
+Source0:       https://ftp.mozilla.org/pub/security/nss/releases/NSS_%{foover}_RTM/src/%{name}-%{version}.tar.gz
+# Source0-md5: b741f968b472fb5565df504efe4e83b5
 Source1:       %{name}-mozilla-nss.pc
 Source2:       %{name}-config.in
-Source3:       http://www.cacert.org/certs/root.der
+Source3:       https://www.cacert.org/certs/root.der
 # Source3-md5: a61b375e390d9c3654eebd2031461f6b
 Source4:       nss-softokn.pc.in
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1083900
+Patch0:                %{name}-include.patch
 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 BuildRequires: nspr-devel >= %{nspr_ver}
-BuildRequires: nss-tools
+%{!?with_bootstrap:BuildRequires:      nss-tools}
 BuildRequires: perl-base
 BuildRequires: sqlite3-devel
 BuildRequires: zlib-devel
@@ -105,6 +106,7 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %if 0%{!?debug:1}
 # strip before signing
@@ -112,8 +114,10 @@ Biblioteka kryptograficzna freebl dla bibliotek NSS.
 %endif
 
 %build
+%if %{without bootstrap}
 # http://wiki.cacert.org/wiki/NSSLib
 addbuiltin -n "CAcert Inc." -t "CT,C,C" < %{SOURCE3} >> nss/lib/ckfw/builtins/certdata.txt
+%endif
 
 %ifarch %{x8664} ppc64 sparc64 aarch64
 export USE_64=1
@@ -129,6 +133,7 @@ export BUILD_OPT=1
 export MOZILLA_CLIENT=1
 export NSDISTMODE=copy
 export NSPR_INCLUDE_DIR=/usr/include/nspr
+export NSS_ENABLE_WERROR=0
 export NSS_USE_SYSTEM_SQLITE=1
 export USE_PTHREADS=1
 export USE_SYSTEM_ZLIB=1
@@ -148,10 +153,14 @@ export USE_X32=1
        NSS_ECC_MORE_THAN_SUITE_B=1 \
        CC="%{__cc}" \
        OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
+       OS_TEST="%{_target_cpu}" \
+       NS_USE_GCC=1
 
 %{__make} -C noecc/nss all \
        CC="%{__cc}" \
-       OPTIMIZER="%{rpmcflags} %{rpmcppflags}"
+       OPTIMIZER="%{rpmcflags} %{rpmcppflags}" \
+       OS_TEST="%{_target_cpu}" \
+       NS_USE_GCC=1
 
 %install
 rm -rf $RPM_BUILD_ROOT