diff options
| -rwxr-xr-x | checkout-all-packages.sh | 2 | ||||
| -rwxr-xr-x | prepare-all-srpms.sh | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/checkout-all-packages.sh b/checkout-all-packages.sh index 542b6ba..db76608 100755 --- a/checkout-all-packages.sh +++ b/checkout-all-packages.sh @@ -28,7 +28,7 @@ remove_pkgs() { #---------------------------------------------------------- nssPkgs="nspr nss-util nss-softokn nss" -clientPkgs="crypto-utils curl dconf evolution-data-server mod_nss libreswan firefox" +clientPkgs="" # default branch=master diff --git a/prepare-all-srpms.sh b/prepare-all-srpms.sh index 60ed67d..3acbf6e 100755 --- a/prepare-all-srpms.sh +++ b/prepare-all-srpms.sh @@ -20,10 +20,7 @@ srpm_pkgs() { fi for p in $1; do pushd $p - 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 cp -p $p-*.src.rpm ../packages/SRPMS popd done @@ -38,10 +35,7 @@ checkout_and_srpm_pkgs() { for p in $1; do fedpkg clone $p ${OPTION_BRANCH} --anonymous pushd $p - 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 cp -p $p-*.src.rpm ../packages/SRPMS popd done @@ -49,7 +43,7 @@ checkout_and_srpm_pkgs() { #---------------------------------------------------------- nssPkgs="nspr nss-util nss-softokn nss" -clientPkgs="crypto-utils curl dconf evolution-data-server libreswan firefox" +clientPkgs="" # default branch=master |