mirror of
https://github.com/cryb-to/cryb-to.git
synced 2025-01-24 12:41:11 +00:00
Fix versioning when PACKAGE_VERSION is in dotted-decimal form.
This commit is contained in:
parent
cf46393d5e
commit
a0444f1b08
1 changed files with 4 additions and 4 deletions
|
@ -1,6 +1,6 @@
|
|||
#!/bin/sh
|
||||
#-
|
||||
# Copyright (c) 2013-2015 Dag-Erling Smørgrav
|
||||
# Copyright (c) 2013-2017 Dag-Erling Smørgrav
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
|
@ -75,9 +75,9 @@ pkgabi=$(pkg config abi)
|
|||
#
|
||||
package="@PACKAGE@"
|
||||
version="@PACKAGE_VERSION@"
|
||||
if ! expr "$version" : "[0-9]{1,}$" >/dev/null ; then
|
||||
if ! expr "$version" : '^[0-9]\{1,\}\(\.[0-9]\{1,\}\)*$' >/dev/null ; then
|
||||
svnversion="$(svnversion 2>&1)"
|
||||
svnversion=$(expr "$svnversion" : '\([0-9][0-9]*\)[A-Z]\{0,1\}$')
|
||||
svnversion=$(expr "$svnversion" : '^\([0-9][0-9]*\)[A-Z]\{0,1\}$')
|
||||
if [ -n "$svnversion" ] ; then
|
||||
package="$package-$version"
|
||||
version="r$svnversion"
|
||||
|
@ -136,7 +136,7 @@ info "Generating the stub manifest."
|
|||
manifest="$tmproot/+MANIFEST"
|
||||
cat >"$manifest" <<EOF
|
||||
name: $package
|
||||
version: $version
|
||||
version: "$version"
|
||||
origin: local/$package
|
||||
comment: BSD-licensed cryptographic libraries
|
||||
arch: $pkgabi
|
||||
|
|
Loading…
Reference in a new issue