From 324fc800e973487ff834c873d08ebb20792176c7 Mon Sep 17 00:00:00 2001 From: "Anselmo L. S. Melo" Date: Fri, 3 Apr 2020 10:18:15 -0700 Subject: [PATCH] specfiles: Allow archives in R pattern The rationale behind this was to support extra tarball for R-RSQLite, in order to bump the bundled sqlite version using sqlite's upstream tarball instead of a local (huge) patch applied to the package. --- autospec/specfiles.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/autospec/specfiles.py b/autospec/specfiles.py index 8e7b22b..661e513 100644 --- a/autospec/specfiles.py +++ b/autospec/specfiles.py @@ -416,14 +416,15 @@ class Specfile(object): self._write_strip("%setup -q -D -T -n " + self.content.tarball_prefix) self._write_strip("gem spec %{{SOURCE0}} -l --ruby > {}.gemspec".format(self.name)) else: - if self.default_pattern == 'R': - self._write_strip("%setup -q -c -n " + self.content.tarball_prefix) - elif self.default_pattern == "godep": + if self.default_pattern == "godep": # No setup needed each source is installed as is pass else: prefix = self.content.prefixes[self.url] - if prefix: + if self.default_pattern == 'R': + prefix = self.content.tarball_prefix + self._write_strip("%setup -q -c -n " + prefix) + elif prefix: self._write_strip("%setup -q -n " + prefix) else: # Have to make up a path and create it