diff options
| -rwxr-xr-x | bin/build-rpm-package | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 155b5b1..87021a8 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -186,7 +186,10 @@ build_packages() { cd $TEMP_DIR rm -Rf "$PROJECT/.git" cp $PROJECT/$PROJECT.spec . + UPSTREAM_VERSION=$(cat $PROJECT.spec | egrep "^Version:.*" | awk '{ print $2 }') + PKG_RELEASE=$(cat $PROJECT.spec | egrep "^Release:.*" | awk '{ print $2 }') + GITREV=$(cd $PROJECT && gitrevno && cd - 1>/dev/null) mv $TEMP_DIR/$PROJECT $TEMP_DIR/$PROJECT-$UPSTREAM_VERSION @@ -198,7 +201,6 @@ build_packages() { # clean up the Git clone from the temp folder cd && rm $TEMP_DIR/$PROJECT -Rf - cat "$PROJECT_DIR/RPM_BUILDS_FOR" | egrep -v '(^$|^#.*$)' | while read line; do l_DIST="$(echo ${line/: /:} | cut -d":" -f1 | tr [:upper:] [:lower:])" l_CODENAMES="${CODENAMES:-$(echo ${line/: /:} | cut -d":" -f2- | tr [:upper:] [:lower:])}" @@ -242,10 +244,9 @@ build_packages() { ### TODO: build amd64/i386 packages here - echo . - #[ "x$SKIP_ARCH" != "xamd64" ] && cat debian/control | egrep 'Architecture.*(all|any|amd64)' >/dev/null && { - # DIST=$l_DIST CODENAME=$l_CODENAME ARCH=amd64 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/amd64" -- --allow-untrusted $SA_OPTION 0<&- - #} + [ "x$SKIP_ARCH" != "xamd64" ] && { + mock ~/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_RELEASE.src.rpm + } #[ "x$SKIP_ARCH" != "xi386" ] && cat debian/control | egrep 'Architecture.*(any|i386)' >/dev/null && { # DIST=$l_DIST CODENAME=$l_CODENAME ARCH=i386 $PDEBUILD --auto-debsign --debsign-k $GPG_KEY --buildresult "$PKGDIST/$l_DIST/$l_CODENAME/i386" -- --binary-arch --allow-untrusted $SA_OPTION 0<&- #} |