diff options
| author | Michael Scherer <misc@mandriva.com> | 2004-05-04 13:50:55 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mandriva.com> | 2004-05-04 13:50:55 +0000 |
| commit | 7726114e1633e57feff7e6fa7fa77993ea26fc01 (patch) | |
| tree | 3639b06776661637dbcf0d991d44eff8045d6aaa /rpmbuildupdate | |
| parent | c2aacae39595b51190cc4bf19c173eec7ffaebdc (diff) | |
| download | bootsplash-7726114e1633e57feff7e6fa7fa77993ea26fc01.tar bootsplash-7726114e1633e57feff7e6fa7fa77993ea26fc01.tar.gz bootsplash-7726114e1633e57feff7e6fa7fa77993ea26fc01.tar.bz2 bootsplash-7726114e1633e57feff7e6fa7fa77993ea26fc01.tar.xz bootsplash-7726114e1633e57feff7e6fa7fa77993ea26fc01.zip | |
fixed some regexp causing problems when a whitespace is present at the end of the lines for spec files variables
Diffstat (limited to 'rpmbuildupdate')
| -rwxr-xr-x | rpmbuildupdate | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rpmbuildupdate b/rpmbuildupdate index 211be89..b5de3c8 100755 --- a/rpmbuildupdate +++ b/rpmbuildupdate @@ -195,13 +195,13 @@ sub build $spec .= $_; $spec =~ s/\%define(\s+)release(\s+)(.*)/\%define release $config{release}/; - $spec =~ s/Release:(\s+)(.*mdk)/Release:$1$config{release}/; - push(@url, $2) if(/(Source[0-9]*):\s+((?:ftp|svns?|https?):\S+)/i); + $spec =~ s/Release\s*:(\s+)(\S*mdk)/Release:$1$config{release}/; + push(@url, $2) if(/(Source[0-9]*)\s*:\s+((?:ftp|svns?|https?):\S+)/i); # For %vars ! - $specvars{$1} = $2 if(/\%define\s+(.+?)\s+(.+)/g); - $specvars{version} = $1 if(!$specvars{version} && /Version:\s+(.+)/gi); - $specvars{name} = $1 if(!$specvars{name} && /Name:\s+(.+)/gi); + $specvars{$1} = $2 if(/\%define\s+(\S+?)\s+(\S+)/g); + $specvars{version} = $1 if(!$specvars{version} && /Version\s*:\s+(\S+)/gi); + $specvars{name} = $1 if(!$specvars{name} && /Name\s*:\s+(\S+)/gi); if(/\%changelog/) { |