diff --git a/autospec-1.16.4.90-spec_create_from_git_with_cmdline_version.patch b/autospec-1.16.4.90-spec_create_from_git_with_cmdline_version.patch new file mode 100644 index 0000000..0398722 --- /dev/null +++ b/autospec-1.16.4.90-spec_create_from_git_with_cmdline_version.patch @@ -0,0 +1,65 @@ +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" \ No newline at end of file diff --git a/autospec.spec b/autospec.spec index 0cf5b71..57b8bcc 100644 --- a/autospec.spec +++ b/autospec.spec @@ -4,7 +4,7 @@ Name: autospec Version: 1.16.4.90 -Release: 1mamba +Release: 2mamba Summary: Create specfiles and automatically update/check/fix rpm packages Summary(it): Crea specfile ed aggiorna/controlla/corregge in modo automatico pacchetti rpm Group: Development/Tools @@ -15,6 +15,7 @@ URL: https://sites.google.com/site/davidemadrisan/opensource#TOC-autos # http://git.openmamba.org/?p=autospec.git;a=summary #Source: autospec-%{version}.tar.bz2 Source: http://gitlab.mambasoft.it/openmamba/autospec.git/v%{version}/autospec-%{version}.tar.bz2 +Patch0: autospec-1.16.4.90-spec_create_from_git_with_cmdline_version.patch ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END Requires(pre): bash @@ -125,6 +126,7 @@ Questo pacchetto contiene alcuni script extra. %prep %setup -q +%patch0 -p1 %build make prefix=%{_prefix} @@ -175,6 +177,9 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %{_bindir}/autoupdate-* %changelog +* Wed Aug 20 2014 Silvan Calarco 1.16.4.90-2mamba +- add patch to create archives from git using command line passed version + * Tue Aug 19 2014 Silvan Calarco 1.16.4.90-1mamba - update to 1.16.4.90