summaryrefslogtreecommitdiffstats
path: root/build_nss_inside_mock.sh
diff options
context:
space:
mode:
authorElio Maldonado <emaldona@redhat.com>2013-09-27 14:14:01 -0700
committerElio Maldonado <emaldona@redhat.com>2013-09-27 14:14:01 -0700
commitc10a849100db72a667a417939cb2b073706cc689 (patch)
tree926ce82d24af3d19f4b0e3156df87377b856ae87 /build_nss_inside_mock.sh
parentaa3beac07f1cbededa5910ff1b4f0f0a0401dad5 (diff)
downloadnssmockbuilds4fedora-c10a849100db72a667a417939cb2b073706cc689.tar.gz
nssmockbuilds4fedora-c10a849100db72a667a417939cb2b073706cc689.tar.xz
nssmockbuilds4fedora-c10a849100db72a667a417939cb2b073706cc689.zip
Various fixes
- replace varuious conditionals with if then else fi statements - reorder the list of client packages to build
Diffstat (limited to 'build_nss_inside_mock.sh')
-rwxr-xr-xbuild_nss_inside_mock.sh28
1 files changed, 7 insertions, 21 deletions
diff --git a/build_nss_inside_mock.sh b/build_nss_inside_mock.sh
index 3e2bed3..5d3c6b1 100755
--- a/build_nss_inside_mock.sh
+++ b/build_nss_inside_mock.sh
@@ -1,8 +1,6 @@
#!/bin/bash
-# Build the nss package set and some nss clients inside mock
+# Build package inside mock
-#dist=19
-#arch=x86_64
# Ignore these warnings
# Installing /builddir/build/RPMS
@@ -10,24 +8,12 @@
# error: /builddir/build/RPMS cannot be installed
cd /builddir/build/RPMS/
-# build and install the nss packages
-nss_pkgs="nspr nss-util nss-softokn nss"
-NSS_PKGS=${NSS_PKGS:-$nss_pkgs}
-
-client_pkgs="crypto-utils curl evolution-data-server mod_nss mod_revocator openswan xulrunner"
-CLIENT_PKGS=${CLIENT_PKGS:-$client_pkgs}
+# build a client package and install all the produced rpm's
+default="nss"
+pkg=${pkg:-$default}
# build and install the nss packages
-for pkg in $NSS_PKGS; do
- rpmbuild --rebuild /tmp/${pkg}-*.src.rpm
- package=`rpm -qp /tmp/${pkg}-*.src.rpm`
- notInstalled=`rpm -q $package | grep "not installed"`
- if [ -n "${notInstalled}" ]; then
- rpm -ihv /builddir/build/RPMS/${pkg}-*
- fi
-done
-# build the client packages
-for pkg in $CLIENT_PKGS; do
- rpmbuild --rebuild /tmp/${pkg}-*.src.rpm
-done
+rpmbuild --rebuild /tmp/${pkg}-*.src.rpm
+cd /builddir/build/RPMS
+rpm --force -ihv *.rpm