Merge branch 'master' of git://fedorapeople.org/~emaldonado/nssmockbuilds4fedora

5 files changed, 23 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 93b6f97..e544fd5 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,17 @@ all: use-defaults
 use-defaults: prepare
 	(export dist=rawhide; export arch=i386; \
 	export nss_pkgs="nspr nss-util nss-softokn nss"; \
-	export clients="curl dconf evolution-data-server libreswan firefox crypto-utils crontabs dconf"; \
+	export clients="crypto-utils"; \
 	sh ./build_nss.sh)
 
 build-for-rawhide-i386: prepare
 	(dist=rawhide arch=i386 \
-	nss_pkgs="nspr nss-util nss-softokn nss" clients="" ./build_nss.sh)
+	export nss_pkgs="nspr nss-util nss-softokn nss"; export clients=""; ./build_nss.sh)
 
 build-for-rawhide-x86_64: prepare
 	(dist=rawhide arch=x86_64 \
-	nss_pkgs="nspr nss-util nss-softokn nss" clients="" ./build_nss.sh)
+	export nss_pkgs="nspr nss-util nss-softokn nss"; export clients=""; ./build_nss.sh)
 
 prepare:
-	./checkout-all-packages.sh
-	./prepare-all-srpms.sh
+	(export clients=""; ./checkout-all-packages.sh)
+	(export clients=""; ./prepare-all-srpms.sh)
diff --git a/build_nss.py b/build_nss.py
index 8c4a416..0660b2f 100755
--- a/build_nss.py
+++ b/build_nss.py
@@ -146,7 +146,7 @@ print_debug("skipWget = %s " % options.skipWget)
 print_debug("nssPackageList = %s " % options.nssPackageList)
 print_debug("clientPackageList = %s " % options.clientPackageList)
 print_debug("mockCfgList = %s " % options.mockCfgList)
-print_debug("noClean = %s " % options.noClean)
+#print_debug("noCleanupAfter = %s " % options.noCleanupAfter)
 
 #######################################################
 mockCfgList=[]
diff --git a/build_nss.sh b/build_nss.sh
index 6910f54..3e57d52 100755
--- a/build_nss.sh
+++ b/build_nss.sh
@@ -33,7 +33,10 @@ all_clients="mod_nss mod_revocator curl evolution-data-server libreswan firefox
 clients=${clients:-$all_clients}
 workdir=`pwd`
 for pkg in ${nss_pkgs}; do
-    fedpkg srpm
+    if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then
+      fedpkg switch-branch private-emaldona-upstream-experiment
+    fi
+    fedpkg --dist=f24 srpm
     mock -r fedora-${dist}-${arch2} --copyin ${pkg}/${pkg}-*.src.rpm /tmp
 done
 # repeat for client packages
diff --git a/checkout-all-packages.sh b/checkout-all-packages.sh
index be383d4..542b6ba 100755
--- a/checkout-all-packages.sh
+++ b/checkout-all-packages.sh
@@ -14,6 +14,9 @@ checkout_pkgs() {
   fi
   for p in $1; do
     fedpkg clone $p ${OPT_BRANCH} -a
+    if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then
+      fedpkg switch-branch private-emaldona-upstream-experiment
+    fi
   done
 }
 
@@ -25,7 +28,7 @@ remove_pkgs() {
 
 #----------------------------------------------------------
 nssPkgs="nspr nss-util nss-softokn nss"
-clientPkgs="crypto-utils curl evolution-data-server mod_nss libreswan firefox"
+clientPkgs="crypto-utils curl dconf evolution-data-server mod_nss libreswan firefox"
 
 # default
 branch=master
diff --git a/prepare-all-srpms.sh b/prepare-all-srpms.sh
index c275c5a..e481482 100755
--- a/prepare-all-srpms.sh
+++ b/prepare-all-srpms.sh
@@ -20,7 +20,10 @@ srpm_pkgs() {
   fi
   for p in $1; do
     pushd $p
-    fedpkg srpm
+    if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then
+      fedpkg switch-branch private-emaldona-upstream-experiment
+    fi
+    fedpkg --dist=f24 srpm
     cp -p $p-*.src.rpm ../packages/SRPMS
     popd
   done
@@ -35,7 +38,10 @@ checkout_and_srpm_pkgs() {
   for p in $1; do
       fedpkg clone $p ${OPTION_BRANCH} --anonymous
     pushd $p
-    fedpkg srpm
+    if [ $p = nss -o $p = nss-util -o $p = nss-softokn" ]; then
+      fedpkg switch-branch private-emaldona-upstream-experiment
+    fi
+    fedpkg --dist=f24 srpm
     cp -p $p-*.src.rpm ../packages/SRPMS
     popd
   done
@@ -43,7 +49,7 @@ checkout_and_srpm_pkgs() {
 
 #----------------------------------------------------------
 nssPkgs="nspr nss-util nss-softokn nss"
-clientPkgs="crypto-utils curl evolution-data-server libreswan firefox"
+clientPkgs="crypto-utils curl dconf evolution-data-server libreswan firefox"
 
 # default
 branch=master