small fixes

bin/rpmbph

@@ -265,6 +265,9 @@ if [ "$PKGVENDOR" != "alt" ] ; then
 	# obsoletes since Slackware/13 (rpm 4.10)
 	subst "s|^BuildPreReq:|BuildRequires:|g" $SPECNAME
 	subst "s|^PreReq:|Requires:|g" $SPECNAME
+
+	# not supported anywhere exclude ALT
+	subst "s|^BuildRequires(pre):|BuildRequires:|g" $SPECNAME
 fi
 
 # Auto*=yes,nomingw32 works only since ALT 4.1

bin/rpmbs

@@ -73,7 +73,7 @@ while getopts :hfstcudnop:a:Ab:z opt; do
 # FIXME: handle SIGN separately
     c) CHECKONLY=1 ; SIGN=1 ;;
     u) UPLOADNOW=1 ; SIGN=1 ;;
-    a) UPLOADNOW=1 ; SIGN=1 ; PREPARETASK=yes ; TASKNUMBER=$OPTARG ;;
+    a) UPLOADNOW=1 ; SIGN=1 ; PREPARETASK=yes ; TASKNUMBER="$(echo $OPTARG | sed -e 's/before/ /g')" ;;
     A) UPLOADNOW=1 ; SIGN=1 ; PREPARETASK=yes ; TASKNUMBER= ;;
 # see functions/alt:set_binaryrepo() for BINARYREPONAME
     b) BINARYREPONAME=$OPTARG ;;
@@ -88,7 +88,7 @@ while getopts :hfstcudnop:a:Ab:z opt; do
 	?) OPTIND=$((OPTIND-1)); break;
     esac
 done
- 
+
 ## remove args that were options
 if [ $# -gt 0 ]; then
 	shift $((OPTIND - 1))

bin/rpmcs

@@ -382,7 +382,7 @@ do
 		s|%python_version|%__python_version|g
 		s|%python2_version|%__python_version|g
 		s|%python_sitelib/|%python_sitelibdir/|g
-		s|%_libdir/python2.6/site-packages/|%python_sitelibdir/|g
+		s|%_libdir/python2.[67]/site-packages/|%python_sitelibdir/|g
 		s|%py_sitedir/|%python_sitelibdir/|g
 		s|%python_sitearch|%python_sitelibdir|g
 		s|%python2_sitearch|%python_sitelibdir|g

share/eterbuild/pkgrepl/pkgrepl.deb

@@ -318,3 +318,5 @@ libXinerama|libxinerama1
 libXcomp|libxcomp3
 
 mailx|mailutils
+libssh2-devel|libssh2-1-dev
+libssh2|libssh2-1