From 409df2e2f5c155c8a6a55c90641664875add8f1e Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Feb 05 2020 08:19:29 +0000
Subject: Set %{packver} to original package version.


This contains the dashes, if there are any, instead of the cleaned-up
dot-only version. Always using this variable reduces diffs when a
package version goes from no-dash to dashed, or vice versa.

---

diff --git a/r2spec/rpackage.py b/r2spec/rpackage.py
index 1e24ea1..3b604ae 100644
--- a/r2spec/rpackage.py
+++ b/r2spec/rpackage.py
@@ -257,8 +257,6 @@ class RPackage(object):
         self.down_version = version.replace('-', '.')
         self.url = self.config.get(repo, 'url')
         self.source0 = self.config.get(repo, 'source')
-        if self.up_version != self.down_version:
-            self.source0 = self.source0.replace('%{version}', self.up_version)
         self.source = '%s_%s.tar.gz' % (self.name, self.up_version)
 
     def set_repo(self, reponame):
diff --git a/r2spec/spec.py b/r2spec/spec.py
index 1c40725..284cc07 100644
--- a/r2spec/spec.py
+++ b/r2spec/spec.py
@@ -150,6 +150,7 @@ class Spec:
         """ Fills the different variable required for the spec file. """
         self.log.info('Filling spec variable from info collected')
         self.__dict['packname'] = self.package.name
+        self.__dict['packver'] = self.package.up_version
         self.__dict['arch'] = self.package.arch
         self.__dict['version'] = self.package.down_version
         self.__dict['summary'] = self.package.get('Title')
diff --git a/r2spec/specfile.tpl b/r2spec/specfile.tpl
index 45d8d1b..8c3b76e 100644
--- a/r2spec/specfile.tpl
+++ b/r2spec/specfile.tpl
@@ -1,4 +1,5 @@
-%global packname  {{ packname }}
+%global packname {{ packname }}
+%global packver  {{ packver }}
 {% if arch %}
 %global rlibdir  %{_libdir}/R/library
 {% else %}
diff --git a/repos.cfg b/repos.cfg
index 3decd81..863f374 100644
--- a/repos.cfg
+++ b/repos.cfg
@@ -1,25 +1,25 @@
 [repo:bioconductor]
 url = https://bioconductor.org/packages/release/bioc/html/%{packname}.html
-source = https://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{version}.tar.gz
+source = https://bioconductor.org/packages/release/bioc/src/contrib/%{packname}_%{packver}.tar.gz
 package = https://bioconductor.org/packages/release/bioc/src/contrib/PACKAGES
 
 [repo:bioconductor-annotation]
 url = https://bioconductor.org/packages/release/data/annotation/html/%{packname}.html
-source = https://bioconductor.org/packages/release/data/annotation/src/contrib/%{packname}_%{version}.tar.gz
+source = https://bioconductor.org/packages/release/data/annotation/src/contrib/%{packname}_%{packver}.tar.gz
 package = https://bioconductor.org/packages/release/data/annotation/src/contrib/PACKAGES
 
 [repo:bioconductor-experiment]
 url = https://bioconductor.org/packages/release/data/experiment/html/%{packname}.html
-source = https://bioconductor.org/packages/release/data/experiment/src/contrib/%{packname}_%{version}.tar.gz
+source = https://bioconductor.org/packages/release/data/experiment/src/contrib/%{packname}_%{packver}.tar.gz
 package = https://bioconductor.org/packages/release/data/experiment/src/contrib/PACKAGES
 
 [repo:cran]
 url = https://CRAN.R-project.org/package=%{packname}
-source = https://cran.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
+source = https://cran.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz
 package = https://cran.r-project.org/src/contrib/PACKAGES
 
 [repo:r-forge]
 url = https://r-forge.r-project.org/projects/%{packname}/index.html
-source = https://r-forge.r-project.org/src/contrib/%{packname}_%{version}.tar.gz
+source = https://r-forge.r-project.org/src/contrib/%{packname}_%{packver}.tar.gz
 package = https://r-forge.r-project.org/src/contrib/PACKAGES