[rpmbuild] support for multi-digit version numbers and add Fedora 22 to default

m-kuhn · m-kuhn · commit abd1978530e4 · 2015-06-26T15:45:50.000+02:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ ARCHS=( "fedora-20-i386"`
`13`	`13`	`"fedora-20-x86_64"`
`14`	`14`	`"fedora-21-i386"`
`15`	`15`	`"fedora-21-x86_64"`
	`16`	`+ "fedora-22-i386"`
	`17`	`+ "fedora-22-x86_64"`
`16`	`18`	`)`
`17`	`19`
`18`	`20`	`# Which git branch to export. Normally take the current`