cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2025-01-24 20:51:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix versioning when PACKAGE_VERSION is in dotted-decimal form.

Browse source
This commit is contained in:
Dag-Erling Smørgrav 2017-03-07 00:23:37 +01:00
parent cf46393d5e
commit a0444f1b08
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
mkpkgng.in
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#- #-
# Copyright (c) 2013-2015 Dag-Erling Smørgrav # Copyright (c) 2013-2017 Dag-Erling Smørgrav
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -75,9 +75,9 @@ pkgabi=$(pkg config abi)
# #
package="@PACKAGE@" package="@PACKAGE@"
version="@PACKAGE_VERSION@" 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="$(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 if [ -n "$svnversion" ] ; then
package="$package-$version" package="$package-$version"
version="r$svnversion" version="r$svnversion"
@ -136,7 +136,7 @@ info "Generating the stub manifest."
manifest="$tmproot/+MANIFEST" manifest="$tmproot/+MANIFEST"
cat >"$manifest" <<EOF cat >"$manifest" <<EOF
name: $package name: $package
version: $version version: "$version"
origin: local/$package origin: local/$package
comment: BSD-licensed cryptographic libraries comment: BSD-licensed cryptographic libraries
arch: $pkgabi arch: $pkgabi