- Simplified the scripts

- Using for loops to iterate through all packages
- Defaults are to not build pckages
- Must pass a version and relase number for a package to be built

4 files changed, 72 insertions, 96 deletions

diff --git a/install-clients-deps.sh b/install-clients-deps.sh
index 77195ff..5c31eb7 100755
--- a/install-clients-deps.sh
+++ b/install-clients-deps.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Defaults
-TARGET=14
+TARGET=16
 ARCH=x86_64
 
 while getopts i:j: opt
@@ -17,7 +17,7 @@ done
 export dist=${TARGET}
 export arch=${ARCH}
 
-cc="curl xulrunner"; 
+cc="crypto-utils curl xulrunner"; 
 
 for c in $cc; do
   pushd ${c}
diff --git a/mock-build-inside.sh b/mock-build-inside.sh
index 6e8de2e..8cadb37 100755
--- a/mock-build-inside.sh
+++ b/mock-build-inside.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 #
-# Rebase to nss to 3.12.9 and nspr 4.8.7 and use mock to build nss for Rawhide
+# Rebase nss and nspr using mock to build nss and clients
 # Using beta candidates
 #
 #  --nspr=nspr-version
@@ -25,17 +25,18 @@ export archalso=${ARCHALSO}
 }
 
 #----------------------------------------------------------
-# Defaults
-NSPR_V=4.8.7
-NSPR_R=1
-NSS_V=3.12.9
-NSS_R=8
-NSS_UTIL_V=3.12.9
+# Defaults to not building any package
+# you must pass a {version,release} for it to be built
+NSPR_V=
+NSPR_R=
+NSS_V=
+NSS_R=
+NSS_UTIL_V=
 NSS_UTIL_R=1
-NSS_SOFTOKN_V=3.12.9
-NSS_SOFTOKN_R=5
-TARGET=14
-DIST=14
+NSS_SOFTOKN_V=
+NSS_SOFTOKN_R=
+TARGET=16
+DIST=16
 ARCH=x86_64
 ARCHALSO=x86_64
 
@@ -66,15 +67,15 @@ export_tags
 # for ease of installing later
 cd /builddir/build/RPMS/
 
-# build nspr, nss-util, and nss-softokn as root
-rpmbuild --rebuild /tmp/nspr-${nspr_v}-${nspr_r}.fc${target}.src.rpm
-rpm -ihv /builddir/build/RPMS/nspr-*
-rpmbuild --rebuild /tmp/nss-util-${nss_util_v}-${nss_util_r}.fc${target}.src.rpm
-rpm -ihv /builddir/build/RPMS/nss-util-*
-rpmbuild --rebuild /tmp/nss-softokn-${nss_softokn_v}-${nss_softokn_r}.fc${target}.src.rpm
-rpm -ihv /builddir/build/RPMS/nss-softokn-*
-# build nss as mockbuild
-su mockbuild -c 'rpmbuild --rebuild /tmp/nss-${nss_v}-${nss_r}.fc${target}.src.rpm /builddir/build/RPMS'
-rpm -ihv /builddir/build/RPMS/nss-*.rpm
+# build and install the packages
+nssPkgs="nspr nss-util nss_softokn nss"
+for pkg in nssPkgs; do
+  ver=${pkg}_v
+  rel=${pkg}_r
+  if [ -n ${ver} ] && [ -n ${rel} ]; then
+    rpmbuild --rebuild /tmp/${pkg}-${ver}-${rel}.fc${target}.src.rpm
+    pm -ihv /builddir/build/RPMS/${pkg}-*
+  fi
+done
 
 
diff --git a/mock-build-prepare.sh b/mock-build-prepare.sh
index f38bc62..d3b0d60 100755
--- a/mock-build-prepare.sh
+++ b/mock-build-prepare.sh
@@ -1,13 +1,9 @@
 #!/bin/bash
 
 #
-# Rebase to nss to 3.12.9 and nspr 4.8.7 and use mock to build nss for Rawhide
+# Rebase to nss and nspr using mock to build
 # Using beta candidates
 #
-#  --nspr=nspr-version
-#  --nss=nss-version
-#  --fedora=target
-#  --arch=arch or current
 
 export_tags() {
 export nspr_v=${NSPR_V}
@@ -26,64 +22,50 @@ export archalso=${ARCHALSO}
 
 #----------------------------------------------------------
 
-# Defaults
+# Defaults are mostly empty, so that package won't be built
+# unless two values {version,release} are passed in
+nspr_v=
+nspr_r=
+nss_v=
+nss_r=
+nss_util_v=
+nss_util_r=
+nss_softokn_v=
+nss_softokn_r=
 
-NSPR_V=4.8.7
-NSPR_R=1
+target=16
+dist=f16
 
-NSS_V=3.12.9
-NSS_R=8
-
-NSS_UTIL_V=3.12.9
-NSS_UTIL_R=1
-
-NSS_SOFTOKN_V=3.12.9
-NSS_SOFTOKN_R=5
-
-TARGET=14
-DIST=14
-
-ARCH=x86_64
-ARCHALSO=x86_64
+arch=x86_64
+archalso=x86_64
 
 while getopts :a:b:c:d:e:f:g:h:i:j: opt
 do
   case $opt in
-  a) NSPR_V="$OPTARG";;
-  b) NSPR_R="$OPTARG";;
-  c) NSS_V="$OPTARG";;
-  d) NSS_R="$OPTARG";;
-  e) NSS_UTIL_V="$OPTARG";;
-  f) NSS_UTIL_R="$OPTARG";;
-  g) NSS_SOFTOKN_V="$OPTARG";;
-  h) NSS_SOFTOKN_R="$OPTARG";;
-  i) TARGET="$OPTARG";;
-  j) ARCH="$OPTARG";;
+  a) nspr_v="$OPTARG";;
+  b) nspr_r="$OPTARG";;
+  c) nss_v="$OPTARG";;
+  d) nss_r="$OPTARG";;
+  e) nss_util_v="$OPTARG";;
+  f) nss_util_r="$OPTARG";;
+  g) nss_softokn_v="$OPTARG";;
+  h) nss_softokn_r="$OPTARG";;
+  i) target="$OPTARG";;
+  j) arch="$OPTARG";;
   ?) printf "Usage: %s [-a nspr_v] [-b nspr_r] [-c nss_version] [-d nss_r] [-e nss_util_v] [-f nss_util_r]  [-g nss_softokn_v] [-h nss_softokn_r] [-i dist] [-j arch]\n"  $0
      exit 2;;
   esac
 done
 
-if [ "${TARGET}" = "f16" ]; then
+if [ "${TARGET}" = "rawhide" ]; then
+   # change as we move along
+   TARGET = f17
    DIST="rawhide"
 fi
 if [ "${ARCH}" = "i386" ]; then
    ARCHALSO="i686"
 fi
 
-export nspr_v=${NSPR_V}
-export nspr_r=${NSPR_R}
-export nss_v=${NSS_V}
-export nss_r=${NSS_R}
-export nss_util_v=${NSS_UTIL_V}
-export nss_util_r=${NSS_UTIL_R}
-export nss_softokn_v=${NSS_SOFTOKN_V}
-export nss_softokn_r=${NSS_SOFTOKN_R}
-export target=${TARGET}
-export dist=${DIST}
-export arch=${ARCH}
-export archalso=${ARCHALSO}
-
 echo "nspr_v=${nspr_v}"
 echo "nspr_r=${nspr_r}"
 echo "nss_v=${nss_v}"
@@ -103,24 +85,14 @@ mock -r fedora-${dist}-${arch} --init
 mock -r fedora-${dist}-${arch} --install sqlite-devel zlib-devel pkgconfig gawk psmisc perl vim
 mock -r fedora-${dist}-${arch} --install nspr-devel nss-util-devel nss-softokn-devel nss-devel
 
-# Create the srpm's for our packages and copy the srpms into mock
-cd ./nspr
-fedpkg clean; fedpkg srpm 
-mock -r fedora-${dist}-${arch} --copyin nspr-*.fc${target}.src.rpm ${tmpdir4srpms} /tmp
-
-cd ../nss-util
-fedpkg clean; fedpkg srpm
-mock -r fedora-${dist}-${arch} --copyin nss-util-*.fc${target}.src.rpm /tmp
-
-cd ../nss-softokn
-fedpkg clean; fedpkg srpm
-mock -r fedora-${dist}-${arch} --copyin nss-softokn-*.fc${target}.src.rpm /tmp
-
-cd ../nss
-fedpkg clean; fedpkg srpm
-mock -r fedora-${dist}-${arch} --copyin nss-*.fc${target}.src.rpm /tmp
-
-cd ..
+nssPkgs="nspr nss-util nss_softokn nss"
+for pkg in $nssPkgs; do
+  if [ -n ${pkg}_v} ] && [ -n ${pkg}_r ]; then
+    cd ${pkg}; fedpkg clean; fedpkg srpm 
+    # mock -r fedora-${dist}-${arch} --installdeps ${pkg}-*.fc${target}.src.rpm
+    mock -r fedora-${dist}-${arch} --copyin ${pkg}-*.fc${target}.src.rpm /tmp
+  fi
+done-
 
 # copy the build script into mock
 mock -r fedora-${dist}-${arch} --copyin ./mock-build-inside.sh /usr/bin
diff --git a/top-script-f16.sh b/top-script-f16.sh
index 6150258..a8320a0 100644..100755
--- a/top-script-f16.sh
+++ b/top-script-f16.sh
@@ -20,15 +20,18 @@
 # Build nspr, nss-util, nss-softokn, and nss using mock.
 #
 # These exports define what we want to build
-export nspr_v=4.8.7; export nspr_r=2
-export nss_v=3.12.9; export nss_r=13
-export nss_util_v=3.12.9; export nss_util_r=2
-export nss_softokn_v=3.12.9; export nss_softokn_r=7
+export nspr_v=4.8.9; export nspr_r=2
+export nss_v=3.13.1; export nss_r=3
+export nss_util_v=3.13.1; export nss_util_r=1
+export nss_softokn_v=3.12.10; export nss_softokn_r=7
+export nss_softokn_v=
+export nss_softokn_r=
+export nss_softokn_v=; export nss_softokn_r=
 export target=16; export dist=16
 export arch=x86_64; export archalso=x86_64
 
 # prepare for build
-sh ./mock-build-prepare.sh -a ${nspr_v} -b ${nspr_r} -c ${nss_v} -d ${nss_r} -e ${nss_util_v} -f ${nss_util_r} -g ${nss_softokn_v} -h ${nss_softokn_r} -i ${target} -j ${arch}
+./mock-build-prepare.sh -a ${nspr_v} -b ${nspr_r} -c ${nss_v} -d ${nss_r} -e ${nss_util_v} -f ${nss_util_r} -g ${nss_softokn_v} -h ${nss_softokn_r} -i ${target} -j ${arch}
 
 # create a mock shell
 mock -r fedora-rawhide-x86_64 --shell
@@ -38,10 +41,10 @@ mock -r fedora-rawhide-x86_64 --shell
 #-------------------------------------------------------------------------
 
 # Must export these again
-export nspr_v=4.8.7; export nspr_r=2
-export nss_v=3.12.9; export nss_r=13
-export nss_util_r=3.12.9; export nss_util_r=2
-export nss_softokn_r=3.12.9; export nss_softokn_r=7
+export nspr_v=4.8.9; export nspr_r=2
+export nss_v=3.13.1; export nss_r=3
+export nss_util_r=3.13.1; export nss_util_r=1
+export nss_softokn_r=""; export nss_softokn_r=""
 export target=16; export dist=16
 export arch=x86_64; export archalso=x86_64