[ci] Update build_rpm scripts

[barometer.git] / ci / utility / collectd_build_rpm.sh

diff --git a/ci/utility/collectd_build_rpm.sh b/ci/utility/collectd_build_rpm.sh
index db79786..a261c29 100755 (executable)
--- a/ci/utility/collectd_build_rpm.sh
+++ b/ci/utility/collectd_build_rpm.sh
@@ -32,14 +32,14 @@ make dist
 
 cp $COLLECTD_DIR/collectd-$VERSION.tar.bz2 $RPM_WORKDIR/SOURCES/
 
+git apply $DIR/collectd.spec.patch
+
 sed    --regexp-extended \
        --in-place=".bak" \
-       --expression="s/Version:\s+\S+$/Version:       $VERSION/g" \
+       --expression="s/Version:\s+\S+$/Version:        $VERSION/g" \
        $COLLECTD_DIR/contrib/redhat/collectd.spec
 
-sed    --regexp-extended \
-       --in-place \
-       --expression="s/without_intel_rdt:[0-9]/without_intel_rdt:1/g" \
-       $COLLECTD_DIR/contrib/redhat/collectd.spec
+dnf builddep -y $COLLECTD_DIR/contrib/redhat/collectd.spec
 
 rpmbuild --define "_topdir $RPM_WORKDIR" -bb $COLLECTD_DIR/contrib/redhat/collectd.spec
+