diff --git a/ChangeLog b/ChangeLog index f666712..2f9dab3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,15 @@ Fri Aug 15 2014 Madrisan that do not provide any 'configure' script but only an 'autogen,sh' one. Feature asked by Silvan Calarco. + * spec-create - Davide Madrisan + specfile.create(): always execute 'git.create_tarball()' with the option + '--pck-version'. This way a user-provided package version will be used + instead of the default one. + Feature asked by Silvan Calarco. + + * lib/libnetwork.lib - Davide Madrisan + git.download(): document and honour the '--pck-version' when set. + ------------------------------------------------------------------------------- Changes in version 1.16.4 - "Korbielow" release diff --git a/NEWS b/NEWS index 70b5b77..fd8d732 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,11 @@ List of user visible changes in the release 1.16.5 that do not provide any 'configure' script but only an 'autogen,sh' one. Feature asked by Silvan Calarco. + * spec-create - Davide Madrisan + Honour the package version set by the user at command line when generating + a specfile from a git repository. + Feature asked by Silvan Calarco. + -- Bugfix * templates/python - Silvan Calarco diff --git a/lib/libnetwork.lib.in b/lib/libnetwork.lib.in index 3f46ddf..1c2b458 100644 --- a/lib/libnetwork.lib.in +++ b/lib/libnetwork.lib.in @@ -1,6 +1,6 @@ #!/bin/bash # libnetwork.lib -- @package@ library to get info from internet repositories -# Copyright (C) 2008,2010,2012 Davide Madrisan +# Copyright (C) 2008,2010,2012,2014 Davide Madrisan [ "$libnetwork_is_loaded" = 1 ] || { libnetwork_is_loaded=1 @@ -924,6 +924,7 @@ function git.download() { # # args: # -d,--destdir : target directory +# -v,--pck-version : package version # --git-branch : git branch # --preserve-dot-git : do not remove .git files # $@ : git repository diff --git a/plugins/spec-create.in b/plugins/spec-create.in index bf1ca51..4320bbd 100644 --- a/plugins/spec-create.in +++ b/plugins/spec-create.in @@ -1,6 +1,6 @@ #!/bin/bash # pck-create -- plugin for @package@ -# Copyright (C) 2004-2013 Davide Madrisan +# Copyright (C) 2004-2014 Davide Madrisan [ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 3 ] && { echo $"this script requires bash version 3 or better" >&2 && exit 1; } @@ -512,13 +512,14 @@ s,@spec_changelog_comment@,$spec_changelog_comment, # specfile.create() # Parameters: # $1 : try to create a specfile from this tarball -# $2 : package name -# $3 : package version -# $4 : package tipology (template) +# $2 : source (with or without path; can be a remote url) +# $3 : package name +# $4 : package version # $5 : output file # Description: # Create an initial specfile to help packaging activities # + function specfile.create() { notify.debug "[ ${0}${exec_options} ]\n" @@ -537,11 +538,13 @@ function specfile.create() { # 'pck_tarball' = absolute path of '$1' local pck_tarball - local pck_name pck_version + local pck_name + local pck_version="$4" case "$2" in git://*|http://*.git|https://*.git) git.create_tarball \ + --pck-version="$pck_version" \ --git-branch="$git_branch" \ --preserve-dot-git="$preserve_dot_git" \ --destdir="$source_dir" "$2"