diff options
| -rw-r--r-- | rpm/build/BOOTSTRAP | 2 | ||||
| -rwxr-xr-x | rpm/build/build-freeside | 6 | ||||
| -rwxr-xr-x | rpm/build/expect-addsign | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/rpm/build/BOOTSTRAP b/rpm/build/BOOTSTRAP index c7ef4fed0..3fe8d0f79 100644 --- a/rpm/build/BOOTSTRAP +++ b/rpm/build/BOOTSTRAP @@ -58,8 +58,6 @@ mkdir redhat/SRPMS chown -R ivan:ivan redhat vi ~/.rpmmacros -%_topdir /home/ivan/redhat -%_signature gpg %_gpg_path /home/ivan/.gnupg %_gpg_name Freeside Internet Services, Inc. RPM Signing Key diff --git a/rpm/build/build-freeside b/rpm/build/build-freeside index 019d037f8..afef96ab6 100755 --- a/rpm/build/build-freeside +++ b/rpm/build/build-freeside @@ -149,7 +149,8 @@ do DEST=$BRANCH fi # Copy freeside RPMs for this version only - FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` + #FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` + FILES=`ls -1 $MOCKWORK/freeside*-${VERSION}-*.rpm | grep -v .src.rpm | tr '\n' ' '` echo $FILES if [ "${FILES}x" != "x" ] then @@ -165,7 +166,8 @@ do fi fi # Copy non-freeside RPMs to all versions - FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` + #FILES=`ls -1 $MOCKWORK/${os}-${arch}/result/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` + FILES=`ls -1 $MOCKWORK/*.rpm | grep -v freeside | grep -v .src.rpm | tr '\n' ' '` echo $FILES if [ "${FILES}x" != "x" ] then diff --git a/rpm/build/expect-addsign b/rpm/build/expect-addsign index ad5e4f600..5634ed47b 100755 --- a/rpm/build/expect-addsign +++ b/rpm/build/expect-addsign @@ -1,7 +1,8 @@ #!/usr/bin/expect set p "not our actual passphrase" set f [lindex $argv 0] -spawn /bin/rpm --resign $f +#spawn /bin/rpm --resign $f +spawn /usr/bin/rpm --resign $f expect "Enter pass phrase:" send -- "$p\r" expect eof |