From 48bc9d5b2bfc8ec5a1e786b452df4f12c65c14a4 Mon Sep 17 00:00:00 2001 From: Elio Maldonado Date: Mon, 16 Nov 2015 14:48:53 -0800 Subject: Change the list of client packages and make x86_64 the deafault arch to build --- Makefile | 2 +- build_nss.sh | 4 ++-- build_several_inside_mock.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e4ff3e8..93b6f97 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ all: use-defaults use-defaults: prepare (export dist=rawhide; export arch=i386; \ export nss_pkgs="nspr nss-util nss-softokn nss"; \ - export clients="dconf evolution-data-server libreswan xulrunner"; \ + export clients="curl dconf evolution-data-server libreswan firefox crypto-utils crontabs dconf"; \ sh ./build_nss.sh) build-for-rawhide-i386: prepare diff --git a/build_nss.sh b/build_nss.sh index 92815af..add15ab 100755 --- a/build_nss.sh +++ b/build_nss.sh @@ -28,8 +28,8 @@ mock -r fedora-${dist}-${arch} --init nss_pkgs="nspr nss-util nss-softokn nss" nss_pkgs=${nss_pkgs:-$nss_pkgs} -# listed in rough order of importance and dependencies fisrt -all_clients="mod_nss mod_revocator curl evolution-data-server libreswan xulrunner crontabs crypto-utils " +# listed in rough order of importance and dependencies firt +all_clients="mod_nss mod_revocator curl evolution-data-server libreswan firefox crypto-utils crontabs dconf" clients=${clients:-$all_clients} workdir=`pwd` for pkg in ${nss_pkgs}; do diff --git a/build_several_inside_mock.sh b/build_several_inside_mock.sh index 37fbff8..d026b03 100755 --- a/build_several_inside_mock.sh +++ b/build_several_inside_mock.sh @@ -14,7 +14,7 @@ cd /builddir/build/RPMS/ nss_pkgs="nspr nss-util nss-softokn nss" NSS_PKGS=${NSS_PKGS:-$nss_pkgs} -client_pkgs="crypto-utils curl evolution-data-server mod_nss mod_revocator libreswan xulrunner" +client_pkgs="curl evolution-data-server mod_nss mod_revocator libreswan firefox crypto-utils crontabs dconf" CLIENT_PKGS=${CLIENT_PKGS:-$client_pkgs} # build and install the nss packages -- cgit