Skip to content

Commit

Permalink
[rpmbuild] support for multi-digit version numbers and add Fedora 22 …
Browse files Browse the repository at this point in the history
…to default
  • Loading branch information
m-kuhn committed Jun 26, 2015
1 parent eff1357 commit abd1978
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions rpm/buildrpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions rpm/default.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit abd1978

Please sign in to comment.