From abd1978530e41f45179102dc9938f1c3a8766b6d Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Fri, 26 Jun 2015 15:44:37 +0200 Subject: [PATCH] [rpmbuild] support for multi-digit version numbers and add Fedora 22 to default --- rpm/buildrpms.sh | 6 +++--- rpm/default.cfg | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rpm/buildrpms.sh b/rpm/buildrpms.sh index a6569c41587d..d87844f0ebcb 100755 --- a/rpm/buildrpms.sh +++ b/rpm/buildrpms.sh @@ -68,11 +68,11 @@ fi # Get the version string major=$(grep -e 'SET(CPACK_PACKAGE_VERSION_MAJOR' ../CMakeLists.txt | - sed 's/.*\([0-9]\).*/\1/') + sed -r 's/.*\"([0-9]+)\".*/\1/g') minor=$(grep -e 'SET(CPACK_PACKAGE_VERSION_MINOR' ../CMakeLists.txt | - sed 's/.*\([0-9]\).*/\1/') + sed -r 's/.*\"([0-9]+)\".*/\1/g') patch=$(grep -e 'SET(CPACK_PACKAGE_VERSION_PATCH' ../CMakeLists.txt | - sed 's/.*\([0-9]\).*/\1/') + sed -r 's/.*\"([0-9]+)\".*/\1/g') version=$(echo $major.$minor.$patch) diff --git a/rpm/default.cfg b/rpm/default.cfg index 302027c92577..93a11f6a7f95 100644 --- a/rpm/default.cfg +++ b/rpm/default.cfg @@ -13,6 +13,8 @@ ARCHS=( "fedora-20-i386" "fedora-20-x86_64" "fedora-21-i386" "fedora-21-x86_64" + "fedora-22-i386" + "fedora-22-x86_64" ) # Which git branch to export. Normally take the current