diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-12 20:41:43 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2014-10-12 20:41:43 +0200 |
| commit | aebc423fdce17c19e997d3706c93036037dd91a5 (patch) | |
| tree | 8eaf0ef8822528b7948201f9afbe18ba65b78650 | |
| parent | 63079d6934bba935f5e6f1cdb355a9130608f47a (diff) | |
| download | buildscripts-aebc423fdce17c19e997d3706c93036037dd91a5.tar.gz buildscripts-aebc423fdce17c19e997d3706c93036037dd91a5.tar.bz2 buildscripts-aebc423fdce17c19e997d3706c93036037dd91a5.zip | |
don't build via SRPMs, obs-build can build from spec files directly
| -rwxr-xr-x | bin/build-rpm-package | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package index 5013093..5754b75 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -210,7 +210,11 @@ build_packages() { tar -czf $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/$PROJECT-$UPSTREAM_VERSION.tar.gz $PROJECT-$UPSTREAM_VERSION # create the SRPM package - rpmbuild -D "%_topdir $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild" -bs $PROJECT.spec + if [ "x$l_DIST" != "xopensuse" ]; then + rpmbuild -D "%_topdir $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild" -bs $PROJECT.spec + else + cp $PROJECT.spec $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES + fi # clean up the Git clone from the temp folder cd && rm $TEMP_DIR/$PROJECT -Rf @@ -236,7 +240,7 @@ build_packages() { --repo "$OPENSUSE_DOWNLOAD_URL" \ --root "/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/" \ --clean \ - $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SRPMS/$PROJECT-$UPSTREAM_VERSION-$PKG_SRCRELEASE.$IS_RELEASE.git$DATE.$GITREV.$COMPONENT.src.rpm; then + $PKGDIST/$l_DIST/$l_CODENAME/$l_ARCH/rpmbuild/SOURCES/$PROJECT.spec; then mkdir -p "$PKGDIST/$l_DIST/$l_CODENAME/x86_64/" find "/var/cache/obs-build/$l_DIST/$l_CODENAME/x86_64/home/abuild/rpmbuild/RPMS/" -type f | egrep '.*\.rpm$' | while read rpmfile; do cp "$rpmfile" "$PKGDIST/$l_DIST/$l_CODENAME/x86_64/" |