From b69979174904972cf4ef76d85d2f9885bb9ac716 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Aug 14 2023 00:08:03 +0000 Subject: [PATCH 1/3] Use %forgeversion in forge macro spec templates %{forgeversion} is the new way to specify snapshot information. Previously, we relied on %distprefix to record snapshot information. Now, packagers must specifically include %{forgeversion}. The previous approach still works. Invoking %{forgeversion} removes the snapshot info from %distprefix. --- diff --git a/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec b/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec index 5365be5..a6f6ce4 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec @@ -5,7 +5,7 @@ # https://github.com/GoogleCloudPlatform/google-cloud-go %global goipath cloud.google.com/go %global forgeurl https://github.com/GoogleCloudPlatform/google-cloud-go -Version: 0.37.4 +%global version 0.37.4 %gometa @@ -23,6 +23,7 @@ Go packages for Google Cloud Platform services.} %global godocs AUTHORS CODE_OF_CONDUCT.md CONTRIBUTING.md CONTRIBUTORS RELEASING.md old-news.md CHANGES.md README.md Name: %{goname} +Version: %{forgeversion} Release: 1%{?dist} Summary: Google Cloud client libraries for Go diff --git a/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec b/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec index e83eaec..a598a48 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec @@ -1,6 +1,6 @@ # https://github.com/sirupsen/logrus %global goipath github.com/sirupsen/logrus -Version: 1.4.0 +%global version 1.4.0 %gometa @@ -14,6 +14,7 @@ the standard library logger.} %global godocs *.md Name: %{goname} +Version: %{forgeversion} Release: 1%{?dist} Summary: Structured logger for Go License: MIT diff --git a/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec b/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec index 59c9d08..a3ca84e 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec @@ -1,6 +1,6 @@ # https://github.com/stretchr/testify %global goipath github.com/stretchr/testify -Version: 1.2.2 +%global version 1.2.2 %gometa @@ -17,6 +17,7 @@ Features include: %global golicenses LICENSE Name: %{goname} +Version: %{forgeversion} Release: 1%{?dist} Summary: Tools for testifying that your code will behave as you intend License: MIT diff --git a/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec b/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec index 40250d7..9086be9 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec @@ -1,7 +1,7 @@ # https://github.com/square/go-jose %global goipath gopkg.in/square/go-jose.v2 %global forgeurl https://github.com/square/go-jose -Version: 2.1.9 +%global version 2.1.9 %gometa @@ -19,6 +19,7 @@ Requires: %{name} = %{version}-%{release} } Name: %{goname} +Version: %{forgeversion} Release: 1%{?dist} Summary: An implementation of JOSE standards (JWE, JWS, JWT) in Go # Detected licences diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec index ac1266c..4159e9a 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec @@ -25,9 +25,10 @@ # – define “forgeurl”, including “https://” prefixing, if the import path # does not match the repository URL; otherwise it is not necessary, %global forgeurl -# – move the Version: line before the “gometa” call if you are packaging a -# release. -Version: +# The version to use for %%forgeversion. +# Set to 0 if packaging a git snapshot for a project with no releases. +# Set to an actual version if packaging a release or a pre/post release snapshot +%global version %global tag %global commit # @@ -55,8 +56,7 @@ Version: # and you understand the consequences. Otherwise you will just add # maintenance-intensive discrepancies in the distribution. Name: %{goname} -# If not set before -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec index 8b7ec9b..481636e 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec @@ -7,7 +7,7 @@ # overlaps. Try to read them all. # %global goipath -Version: +%global version %global tag %global commit # @@ -75,8 +75,7 @@ Obsoletes: } Name: %{goname} -# If not set before -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec index 72ba86a..2061cdf 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec @@ -18,7 +18,7 @@ # fixed to use the new name as soon as possible. # %global goipath -Version: +%global version %global tag %global commit %gometa @@ -34,8 +34,7 @@ Version: } Name: %{goname} -# If not set before -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec index 58d75bd..f580359 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec @@ -8,7 +8,7 @@ # %global goipath %global forgeurl -Version: +%global version %global tag %global commit %global gocid @@ -60,8 +60,7 @@ Obsoletes: } Name: %{goname} -# If not set before -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec index c578324..09a5bb8 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec @@ -12,7 +12,7 @@ # requires more manual work. # %global goipath -Version: +%global version %global tag %global commit %gometa @@ -34,7 +34,7 @@ Obsoletes: # package instead of “goname”. Separate built binaries in different subpackages # if needed. Name: %{goname} -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec index c98b731..235c4c7 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec @@ -8,7 +8,7 @@ # %global goipath %global forgeurl -Version: +%global version %global tag %global commit %global gocid @@ -50,8 +50,7 @@ Obsoletes: Name: %{goname} -# If not set before -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-6-multi.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-6-multi.spec index 198eb63..7fe3720 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-6-multi.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-6-multi.spec @@ -18,7 +18,7 @@ # Main archive %global goipath0 %global forgeurl0 -Version: +%global version0 %global tag0 %global commit0 %global gocid0 @@ -120,8 +120,7 @@ Obsoletes: # Use usual naming rules when generating binaries. Name: %{goname} -# If not set before -Version: +Version: %{forgeversion -a} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec index a524b72..449057f 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec @@ -10,7 +10,7 @@ # %global goipath %global forgeurl -Version: +%global version %global tag %global commit %gometa @@ -23,8 +23,7 @@ Version: } Name: %{goname} -# If not set before -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{gourl} diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec index 3986a30..2e29b27 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec @@ -9,6 +9,10 @@ # # The branch being packaged %global branch + +# The base version to use for %%forgeversion +%global version + # # – use the “-i” flag to display the variables forgemeta reads and sets # – use the “-v” flag if you want verbose processing @@ -20,7 +24,7 @@ # forgemeta will prepend branch information to dist. Release ordering is # controlled by the packager with x%{?dist}/0.x%{?dist} number chains. Name: -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{forgeurl} diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec index 0af8bb4..40057bb 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec @@ -6,6 +6,12 @@ # # The commit being packaged (when using git, a full hash) %global commit + +# The version to use for %%forgeversion. +# Set to 0 if packaging a git snapshot for a project with no releases. +# Set to an actual version if packaging a pre or post release snapshot +%global version + # # – use the “-i” flag to display the variables forgemeta reads and sets # – use the “-v” flag if you want verbose processing @@ -14,10 +20,11 @@ # The following lines use variables computed by forgemeta as default values. # You can replace them with manual definitions. -# forgemeta will prepend commit information to dist. Release ordering is -# controlled by the packager with x%{?dist}/0.x%{?dist} numbers chains. Name: -Version: +# This macro appends commit version to %%{version}. +# Use the -p flag when packaging a pre-release or project with no releases +# to use `~` instead of `^`. +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{forgeurl} diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-multi.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-multi.spec index 3730473..23a5834 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-multi.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-multi.spec @@ -21,7 +21,7 @@ # # Main archive. In this example we package a full release %global forgeurl0 -Version: +%global version0 # Second archive. %global forgeurl1 @@ -45,6 +45,9 @@ Version: # Release ordering is controlled by the packager with x%{?dist}/0.x%{?dist} # numbers chains. Name: +# Use the -a flag to append snapshot versions for the secondary projects +# (%%forgeurl1 and %%forgeurl2). +Version: %{forgeversion -a} Release: 1%{?dist} Summary: URL: %{forgeurl0} diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec index 7b7ec09..cb47263 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec @@ -11,7 +11,7 @@ # release objects, forgemeta will try to guess the customary way to write # release tags on the selected forge. # If it guesses wrong use the forge-tag template instead of this one. -Version: +%global version # # forgemeta converts the suppplied rpm variables to variables that can be used # in the spec file. Most of those can be overriden before or after the @@ -25,9 +25,9 @@ Version: # You can replace them with manual definitions. For example, replace forgeurl # with the project homepage if it exists separately from the repository URL. # Only replace the variables when it adds value to the spec file and you -# understand the consequences. Release ordering is controlled by the packager -# with x%{?dist}/0.x%{?dist} number chains. +# understand the consequences. Name: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{forgeurl} diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec index bf0035b..598d902 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec @@ -6,6 +6,9 @@ # # The tag being packaged %global tag + +# The base version to use for %%forgeversion +%global version # # – use the “-i” flag to display the variables forgemeta reads and sets # – use the “-v” flag if you want verbose processing @@ -17,7 +20,7 @@ # forgemeta will prepend tag information to dist. Release ordering is # controlled by the packager with x%{?dist}/0.x%{?dist} numbers chains. Name: -Version: +Version: %{forgeversion} Release: 1%{?dist} Summary: URL: %{forgeurl} From df6d69b31498bf8cf8b25d5dc3a74e029e8fea46 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Aug 14 2023 00:08:03 +0000 Subject: [PATCH 2/3] SourceURL: reflect new forge macros repo location --- diff --git a/guidelines/modules/ROOT/pages/SourceURL.adoc b/guidelines/modules/ROOT/pages/SourceURL.adoc index 51bb955..4116e75 100644 --- a/guidelines/modules/ROOT/pages/SourceURL.adoc +++ b/guidelines/modules/ROOT/pages/SourceURL.adoc @@ -28,7 +28,8 @@ This ensures the smallest source rpm to save space on the mirrors and downloads Any software publishing website, permitting the download of source archives via normalized URLs, that can be deduced from a project root URL and version, commit, tag, scm, extension… values is a _“forge”_ -that can be supported by the `redhat-rpm-config` `+%{forgemeta}+` macro. +that can be supported by the +https://sr.ht/~gotmax23/forge-srpm-macros[forge-srpm-macros] `+%{forgemeta}+` macro. Common Forge examples are _GitLab_ and _GitHub_. `+%{forgemeta}+` centralizes and abstracts our knowledge about those forges, so packagers do not have to handle download quirks manually. From 824b27036ccf5ce789c6efd0d1b98e5a985ab419 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Aug 18 2023 18:01:07 +0000 Subject: [PATCH 3/3] Set %version0 instead of %version in forge macro examples --- diff --git a/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec b/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec index a6f6ce4..7e3aaaa 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-cloud-google-go.spec @@ -5,7 +5,7 @@ # https://github.com/GoogleCloudPlatform/google-cloud-go %global goipath cloud.google.com/go %global forgeurl https://github.com/GoogleCloudPlatform/google-cloud-go -%global version 0.37.4 +%global version0 0.37.4 %gometa diff --git a/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec b/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec index a598a48..f039b6f 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-github-sirupsen-logrus.spec @@ -1,6 +1,6 @@ # https://github.com/sirupsen/logrus %global goipath github.com/sirupsen/logrus -%global version 1.4.0 +%global version0 1.4.0 %gometa diff --git a/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec b/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec index a3ca84e..2806cef 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-github-stretchr-testify.spec @@ -1,6 +1,6 @@ # https://github.com/stretchr/testify %global goipath github.com/stretchr/testify -%global version 1.2.2 +%global version0 1.2.2 %gometa diff --git a/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec b/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec index 9086be9..24f423a 100644 --- a/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec +++ b/guidelines/modules/ROOT/examples/golang/golang-gopkg-square-jose-2.spec @@ -1,7 +1,7 @@ # https://github.com/square/go-jose %global goipath gopkg.in/square/go-jose.v2 %global forgeurl https://github.com/square/go-jose -%global version 2.1.9 +%global version0 2.1.9 %gometa diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec index 4159e9a..146acf5 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-0-source-minimal.spec @@ -28,7 +28,7 @@ # The version to use for %%forgeversion. # Set to 0 if packaging a git snapshot for a project with no releases. # Set to an actual version if packaging a release or a pre/post release snapshot -%global version +%global version0 %global tag %global commit # diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec index 481636e..7775333 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-1-source-full.spec @@ -7,7 +7,7 @@ # overlaps. Try to read them all. # %global goipath -%global version +%global version0 %global tag %global commit # diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec index 2061cdf..d75523f 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-2-alternative-import-path-minimal.spec @@ -18,7 +18,7 @@ # fixed to use the new name as soon as possible. # %global goipath -%global version +%global version0 %global tag %global commit %gometa diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec index f580359..bf63e4b 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-3-alternative-import-path-full.spec @@ -8,7 +8,7 @@ # %global goipath %global forgeurl -%global version +%global version0 %global tag %global commit %global gocid diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec index 09a5bb8..1652104 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-4-binary-minimal.spec @@ -12,7 +12,7 @@ # requires more manual work. # %global goipath -%global version +%global version0 %global tag %global commit %gometa diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec index 235c4c7..347476f 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-5-binary-full.spec @@ -8,7 +8,7 @@ # %global goipath %global forgeurl -%global version +%global version0 %global tag %global commit %global gocid diff --git a/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec b/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec index 449057f..b0d63a3 100644 --- a/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec +++ b/guidelines/modules/ROOT/examples/golang/spectemplate-go-7-manual.spec @@ -10,7 +10,7 @@ # %global goipath %global forgeurl -%global version +%global version0 %global tag %global commit %gometa diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec index 2e29b27..c9e431c 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-branch.spec @@ -11,7 +11,7 @@ %global branch # The base version to use for %%forgeversion -%global version +%global version0 # # – use the “-i” flag to display the variables forgemeta reads and sets diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec index 40057bb..25b65df 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-commit.spec @@ -10,7 +10,7 @@ # The version to use for %%forgeversion. # Set to 0 if packaging a git snapshot for a project with no releases. # Set to an actual version if packaging a pre or post release snapshot -%global version +%global version0 # # – use the “-i” flag to display the variables forgemeta reads and sets diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec index cb47263..1e87805 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-release.spec @@ -11,7 +11,7 @@ # release objects, forgemeta will try to guess the customary way to write # release tags on the selected forge. # If it guesses wrong use the forge-tag template instead of this one. -%global version +%global version0 # # forgemeta converts the suppplied rpm variables to variables that can be used # in the spec file. Most of those can be overriden before or after the diff --git a/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec b/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec index 598d902..ba54fbb 100644 --- a/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec +++ b/guidelines/modules/ROOT/examples/spectemplate-forge-tag.spec @@ -8,7 +8,7 @@ %global tag # The base version to use for %%forgeversion -%global version +%global version0 # # – use the “-i” flag to display the variables forgemeta reads and sets # – use the “-v” flag if you want verbose processing