diff --git a/dist/redhat/build_rpm.sh b/dist/redhat/build_rpm.sh index 1116b41..cae28a4 100755 --- a/dist/redhat/build_rpm.sh +++ b/dist/redhat/build_rpm.sh @@ -1,27 +1,16 @@ #!/bin/sh -e SCYLLA_VER=0.00 -RPMBUILD=~/rpmbuild +RPMBUILD=build/rpmbuild if [ ! -e dist/redhat/build_rpm.sh ]; then echo "run build_rpm.sh in top of scylla-jmx dir" exit 1 fi -if [ ! -f /usr/bin/git ] || [ ! -f /usr/bin/yum-builddep ] || [ ! -f /usr/bin/rpmbuild ]; then - sudo yum install -y yum-utils git rpm-build rpmdevtools +if [ ! -f /usr/bin/git ] || [ ! -f /usr/bin/mock ] || [ ! -f /usr/bin/rpmbuild ]; then + sudo yum install -y git mock rpm-build fi mkdir -p $RPMBUILD/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} -curdir=`basename $(pwd)` -cd .. -if [ "$curdir" != "scylla-jmx-$SCYLLA_VER" ]; then - echo "WARNING: base directory name should be 'scylla-jmx-$SCYLLA_VER'" - ln -s $curdir scylla-jmx-$SCYLLA_VER -fi -tar --exclude-vcs --exclude-vcs-ignores -cpf $RPMBUILD/SOURCES/scylla-jmx-$SCYLLA_VER.tar scylla-jmx-$SCYLLA_VER $curdir -if [ "$curdir" != "scylla-jmx-$SCYLLA_VER" ]; then - rm scylla-jmx-$SCYLLA_VER -fi -cd - -cp dist/redhat/scylla-jmx.spec $RPMBUILD/SPECS -sudo yum-builddep -y $RPMBUILD/SPECS/scylla-jmx.spec -rpmbuild --define "_topdir $RPMBUILD" -ba $RPMBUILD/SPECS/scylla-jmx.spec +git archive --format=tar --prefix=scylla-jmx-$SCYLLA_VER/ HEAD -o build/rpmbuild/SOURCES/scylla-jmx-$SCYLLA_VER.tar +rpmbuild -bs --define "_topdir $RPMBUILD" -ba dist/redhat/scylla-jmx.spec +mock rebuild --resultdir=`pwd`/build/rpms $RPMBUILD/SRPMS/scylla-jmx-$SCYLLA_VER*.src.rpm diff --git a/dist/redhat/scylla-jmx.spec b/dist/redhat/scylla-jmx.spec index 19c0553..bc7ded3 100644 --- a/dist/redhat/scylla-jmx.spec +++ b/dist/redhat/scylla-jmx.spec @@ -9,7 +9,7 @@ URL: http://www.seastar-project.org/ Source0: %{name}-%{version}.tar BuildArch: noarch -BuildRequires: maven java-1.8.0-openjdk +BuildRequires: maven java-1.8.0-openjdk systemd-units Requires: maven java-1.8.0-openjdk scylla-server %description