summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElio Maldonado <emaldona@redhat.com>2015-11-16 14:48:53 -0800
committerElio Maldonado <emaldona@redhat.com>2015-11-16 14:48:53 -0800
commit48bc9d5b2bfc8ec5a1e786b452df4f12c65c14a4 (patch)
treebb5ce7ec5ab842713d1ed812d01bff7928b96f64
parent92463ca7a0cd4dff774543c0b59a736f00713127 (diff)
downloadnssmockbuilds4fedora-48bc9d5b2bfc8ec5a1e786b452df4f12c65c14a4.tar.gz
nssmockbuilds4fedora-48bc9d5b2bfc8ec5a1e786b452df4f12c65c14a4.tar.xz
nssmockbuilds4fedora-48bc9d5b2bfc8ec5a1e786b452df4f12c65c14a4.zip
Change the list of client packages and make x86_64 the deafault arch to build
-rw-r--r--Makefile2
-rwxr-xr-xbuild_nss.sh4
-rwxr-xr-xbuild_several_inside_mock.sh2
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