diff options
author | Michael Scherer <misc@mandriva.com> | 2005-08-27 19:32:25 +0000 |
---|---|---|
committer | Michael Scherer <misc@mandriva.com> | 2005-08-27 19:32:25 +0000 |
commit | dc3d750789a717a678b77b07ab98b1474a37af8f (patch) | |
tree | edf27ef2883548bdf27127edfff6e4fea884d177 | |
parent | 20e5770d791fe059678f1d0bfe879710b472ae3b (diff) | |
download | bootsplash-dc3d750789a717a678b77b07ab98b1474a37af8f.tar bootsplash-dc3d750789a717a678b77b07ab98b1474a37af8f.tar.gz bootsplash-dc3d750789a717a678b77b07ab98b1474a37af8f.tar.bz2 bootsplash-dc3d750789a717a678b77b07ab98b1474a37af8f.tar.xz bootsplash-dc3d750789a717a678b77b07ab98b1474a37af8f.zip |
- fix parsing of file with macro that contains a tag ( like cyrus-imapd.spec, 1.29 , 2nd line of macro :
%{?!mdkversion: %define mdkversion %(perl -pe '/(\\d+)\.(\\d)\.?(\\d)?/; $_="$1$2".($3||0)' /etc/mandrake-release)} ).
-rwxr-xr-x | rpmbuildupdate | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/rpmbuildupdate b/rpmbuildupdate index e0afe81..ba33514 100755 --- a/rpmbuildupdate +++ b/rpmbuildupdate @@ -202,7 +202,6 @@ sub build { my ($message, $spec, @url, %specvars); my ($newrelease, $release_prefix) = ($1,$2) if $release =~ /^(.*\d+)(\D*)$/g; my $hdlist_spec = Hdlist::specnew($spec_path) or die "Unable to parse spec $spec_path\n"; - if ($newversion) { print "===> Building $pkg $newversion\n"; } else { @@ -269,7 +268,7 @@ sub build { # For %vars ! $specvars{$1} = $2 if /\%define\s+(\S+?)\s+(\S+)/g; foreach my $i ('url', 'name', 'version', 'release') { - $specvars{$i} = $1 if !$specvars{$i} && /$i\s*:\s+(\S+)/gi; + $specvars{$i} = $1 if !$specvars{$i} && /\b$i\s*:\s+(\S+)/gi; } if (/^\%changelog/) { |