Attachment 907311 Details for Bug 689919 – Additional spec changes to truly build with softoken etc. removed

[patch] Additional spec changes to truly build with softoken etc. removed

specFileFix.patch (text/plain), 1.97 KB, created by Elio Maldonado Batiz on 2014-06-10 15:52:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-06-10 15:52:18 UTC

Size: 1.97 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index 038b843..bda660d 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -16,7 +16,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.16.1
>-Release:          4%{?dist}
>+Release:          5%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -224,6 +224,16 @@ done
> %{__cp} ./nss/lib/softoken/lowkeyi.h ./nss/cmd/rsaperf
> %{__cp} ./nss/lib/softoken/lowkeyti.h ./nss/cmd/rsaperf
> 
>+##### Remove util/freebl/softoken and low level tools
>+######## Remove freebl, softoken and util
>+%{__rm} -rf ./nss/lib/freebl
>+%{__rm} -rf ./nss/lib/softoken
>+%{__rm} -rf ./nss/lib/util
>+######## Remove nss-softokn test tools as we already ran
>+# the cipher test suite as part of the nss-softokn build
>+%{__rm} -rf ./nss/cmd/bltest
>+%{__rm} -rf ./nss/cmd/fipstest
>+%{__rm} -rf ./nss/cmd/rsaperf_low
> 
> %build
> 
>@@ -297,17 +307,6 @@ export NSS_ENABLE_ECC
> NSS_DISABLE_HW_GCM=1
> export NSS_DISABLE_HW_GCM
> 
>-##### phase 1: remove util/freebl/softoken and low level tools
>-######## Remove freebl, softoken and util
>-%{__rm} -rf ./mozilla/security/nss/lib/freebl
>-%{__rm} -rf ./mozilla/security/nss/lib/softoken
>-%{__rm} -rf ./mozilla/security/nss/lib/util
>-######## Remove nss-softokn test tools as we already ran
>-# the cipher test suite as part of the nss-softokn build
>-%{__rm} -rf ./mozilla/security/nss/cmd/bltest
>-%{__rm} -rf ./mozilla/security/nss/cmd/fipstest
>-%{__rm} -rf ./mozilla/security/nss/cmd/rsaperf_low
>-
> ##### phase 2: build the rest of nss
> NSS_ENABLE_ECC=1
> export NSS_ENABLE_ECC
>@@ -732,6 +731,10 @@ fi
> 
> 
> %changelog
>+* Tue Jun 10 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-5
>+- Move removal of directories to the end of the %%prep section
>+- Resolves: Bug 689919 - build without any softoken or util sources in the tree
>+
> * Fri Jun 06 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-4
> - Remove unused patches rendered obsolete
>

Flags:

rrelyea: review+

Actions: View | Diff

Attachments on bug 689919: 520484 | 520485 | 520486 | 520488 | 520489 | 888122 | 888123 | 907311