From 9be9815b1dcf3820fbe95ca16f4c7bd34464aa12 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 29 Mar 2018 13:04:24 +0200 Subject: jenkinsfile update --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 04c239f..9cbcf91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,9 +22,9 @@ def RPMSource() { def RPMBuild() { sh ''' # fresh snapshot tarball - rm -f *.tar* + rm -f *.tar.gz (cd source; scripts/tarball.sh) - tarball="$(cd source; ls *.tar*)" + tarball="$(cd source; ls *.tar.gz)" mv source/$tarball . # figure version @@ -40,6 +40,7 @@ def RPMBuild() { -e "s/\\(Version:[ \\t]\\+\\)\\(.*\\)/\\1${version}/" \ -e "s/\\(Release:[ \\t]\\+\\)\\(.*\\)/\\1${gcnt}.${BUILD_NUMBER}.${ghash}/" \ -e "s/\\(Source0:[ \\t]\\+\\)\\(.*\\)/\\1${tarball}/" \ + -e "s/\\(%setup\\)\\(.*\\)/\\1 -n ${tarball%.tar.gz}/" \ *.spec diff -u *.spec.orig *.spec || true -- cgit