Updated option to be f25 and removed several default clients packages

4 files changed, 5 insertions, 7 deletions

diff --git a/build_nss.py b/build_nss.py
index 8e81117..37f9457 100755
--- a/build_nss.py
+++ b/build_nss.py
@@ -50,7 +50,7 @@ parser.add_argument('-f', '--flavor',
 
 parser.add_argument('-r', '--rel',
                     action="store", dest="rel", 
-                    default=None, choices=("rawhide", "f23" ),
+                    default=None, choices=("rawhide", "f25" ),
                     help='specify a release to use for mock config.  [default=None]')
 
 parser.add_argument('-a', '--arch', 
diff --git a/build_nss.sh b/build_nss.sh
index 6910f54..3f0dae4 100755
--- a/build_nss.sh
+++ b/build_nss.sh
@@ -29,7 +29,7 @@ nss_pkgs="nspr nss-util nss-softokn nss"
 nss_pkgs=${nss_pkgs:-$nss_pkgs}
 
 # listed in rough order of importance and dependencies
-all_clients="mod_nss mod_revocator curl evolution-data-server libreswan firefox crypto-utils crontabs dconf"
+all_clients="curl evolution-data-server libreswan firefox"
 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 d026b03..d200680 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="curl evolution-data-server mod_nss mod_revocator libreswan firefox crypto-utils crontabs dconf"
+client_pkgs="curl evolution-data-server mod_nss mod_revocator libreswan firefox"
 CLIENT_PKGS=${CLIENT_PKGS:-$client_pkgs}
 
 # build and install the nss packages
diff --git a/prepare-all-srpms.sh b/prepare-all-srpms.sh
index 3acbf6e..aeae36f 100755
--- a/prepare-all-srpms.sh
+++ b/prepare-all-srpms.sh
@@ -65,8 +65,6 @@ mkdir -p packages/SRPMS
 
 remove_pkgs "${nssPkgs}"
 remove_pkgs "${clientPkgs}"
-#checkout_and_
-srpm_pkgs "${nssPkgs}" "${branch}"
-#checkout_and_
-srpm_pkgs "${clientPkgs}" "${branch}"
+checkout_and_srpm_pkgs "${nssPkgs}" "${branch}"
+checkout_and_srpm_pkgs "${clientPkgs}" "${branch}"