Search
SailfishOS Open Build Service
>
Projects
>
home:plfiorini
:
maui:devel
:
x86_64
>
build
> _service:tar_git:0006-SPEC_REL-can-be-in-prjconf-and-must-be-substituted-a.patch
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File _service:tar_git:0006-SPEC_REL-can-be-in-prjconf-and-must-be-substituted-a.patch of Package build
From 4c919e0bf060ee97c03f4b596c61b537a21c19a2 Mon Sep 17 00:00:00 2001 From: David Greaves <david@dgreaves.com> Date: Thu, 28 Jun 2012 18:47:45 +0100 Subject: [PATCH] <SPEC_REL> can be in prjconf and must be substituted after $release --- substitutedeps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/substitutedeps b/substitutedeps index 3d77840..3c546cb 100755 --- a/substitutedeps +++ b/substitutedeps @@ -113,11 +113,10 @@ for my $line (@$xspec) { } } - if ($line =~ /^Release:(.*)\s*$/i) { + if ($line =~ /^Release:\s*(.*)\s*$/i) { my $spec_rel = $1; # User-provided value my $oldl = $line; if (defined $release) { - $line =~ s/<SPEC_REL>/$spec_rel/; if (!($line =~ s/<RELEASE\d*>/$release/g)) { if ($line =~ /<(?:CI_CNT|B_CNT)>/) { # XXX: should pass ci_cnt/b_cnt instead @@ -134,6 +133,8 @@ for my $line (@$xspec) { $line =~ s/^(Release:\s*).*/$1$release/i; } } + # May be passed in via prjconf in $release so must be done late. + $line =~ s/<SPEC_REL>/$spec_rel/; } else { # remove macros, as rpm doesn't like them $line =~ s/<RELEASE\d*>/0/; -- 1.7.10.3