[freeside-commits] freeside/rpm/build build-freeside, 1.5, 1.6 expect-addsign, 1.1, 1.2

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/rpm/build
In directory wavetail.420.am:/tmp/cvs-serv15339

Modified Files:
	build-freeside expect-addsign 
Log Message:
32 bit and make the repo stuff work, RT#8190

Index: expect-addsign
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/expect-addsign,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- expect-addsign	7 Jul 2010 17:51:58 -0000	1.1
+++ expect-addsign	8 Jul 2010 23:53:10 -0000	1.2
@@ -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

Index: build-freeside
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/build/build-freeside,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -d -r1.5 -r1.6
--- build-freeside	8 Jul 2010 23:08:04 -0000	1.5
+++ build-freeside	8 Jul 2010 23:53:10 -0000	1.6
@@ -149,7 +149,8 @@
 							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 @@
 							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