PR#26: Set %{packver} to original package version. - r2spec

r2spec

#26 Set %{packver} to original package version.

Merged 4 years ago by pingou. Opened 4 years ago by qulogic.

qulogic/r2spec packver into master

Set %{packver} to original package version.

Elliott Sales de Andrade • 4 years ago

409df2e

r2spec/rpackage.py

file modified

-2

		`@@ -257,8 +257,6 @@`
		`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):`

r2spec/spec.py

file modified

		`@@ -150,6 +150,7 @@`
		`""" 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')`

r2spec/specfile.tpl

file modified

+2 -1

		`@@ -1,4 +1,5 @@`
		`- %global packname {{ packname }}`
		`+ %global packname {{ packname }}`
		`+ %global packver {{ packver }}`
		`{% if arch %}`
		`%global rlibdir %{_libdir}/R/library`
		`{% else %}`

repos.cfg

file modified

+5 -5

		`@@ -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`

qulogic commented 4 years ago

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.