summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild_nss.sh5
-rwxr-xr-xcheckout-all-packages.sh3
2 files changed, 1 insertions, 7 deletions
diff --git a/build_nss.sh b/build_nss.sh
index 3e57d52..6910f54 100755
--- a/build_nss.sh
+++ b/build_nss.sh
@@ -33,10 +33,7 @@ all_clients="mod_nss mod_revocator curl evolution-data-server libreswan firefox
clients=${clients:-$all_clients}
workdir=`pwd`
for pkg in ${nss_pkgs}; do
- if [ $p = nss -o $p = nss-util -o $p = nss-softokn ]; then
- fedpkg switch-branch private-emaldona-upstream-experiment
- fi
- fedpkg --dist=f24 srpm
+ fedpkg 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 db76608..3bc4b68 100755
--- a/checkout-all-packages.sh
+++ b/checkout-all-packages.sh
@@ -14,9 +14,6 @@ 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
}