Hello community, here is the log from the commit of package build checked in at Fri Apr 28 21:51:37 CEST 2006. -------- --- build/build.changes 2006-04-19 16:15:19.000000000 +0200 +++ NOARCH/build/build.changes 2006-04-28 18:09:29.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 28 17:07:30 CEST 2006 - mls@suse.de + +- add ndeps back to expansion calls +- save original macro name so that other regexp calls don't destroy + it + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build.spec ++++++ --- /var/tmp/diff_new_pack.y0wMgY/_old 2006-04-28 21:51:27.000000000 +0200 +++ /var/tmp/diff_new_pack.y0wMgY/_new 2006-04-28 21:51:27.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package build (Version 2006.4.19) +# spec file for package build (Version 2006.4.28) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,8 +15,8 @@ Group: Development/Tools/Building Autoreqprov: on Summary: A Script to Build SUSE Linux RPMs -Version: 2006.4.19 -Release: 2 +Version: 2006.4.28 +Release: 1 Source: build.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArchitectures: noarch @@ -49,6 +49,10 @@ %{_mandir}/man1/build.1.gz %changelog -n build +* Fri Apr 28 2006 - mls@suse.de +- add ndeps back to expansion calls +- save original macro name so that other regexp calls don't destroy + it * Wed Apr 19 2006 - mls@suse.de - add --list-state option [#119869] - suppress stat messages when deleting rpms [#154385] ++++++ build.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/build/Build.pm new/build/Build.pm --- old/build/Build.pm 2006-04-11 15:25:57.000000000 +0200 +++ new/build/Build.pm 2006-04-28 18:08:03.000000000 +0200 @@ -129,7 +129,7 @@ @deps = grep {!$ndeps{"-$_"}} @deps; @deps = do_subst($config, @deps); @deps = grep {!$ndeps{"-$_"}} @deps; - @deps = expand($config, @deps); + @deps = expand($config, @deps, @ndeps); return @deps; } @@ -148,7 +148,7 @@ @deps = grep {!$ndeps{"-$_"}} @deps; my %bdeps = map {$_ => 1} (@{$config->{'preinstall'}}, @{$config->{'support'}}); delete $bdeps{$_} for @deps; - @deps = expand($config, @deps); + @deps = expand($config, @deps, @ndeps); if (@deps && $deps[0]) { my $r = shift @deps; @deps = grep {!$bdeps{$_}} @deps; @@ -510,6 +510,7 @@ $expandedline .= $1; $line = $4; my $macname = defined($3) ? $3 : $2; + my $macorig = $2; my $mactest = 0; if ($macname =~ /^\!\?/ || $macname =~ /^\?\!/) { $mactest = -1; @@ -547,7 +548,7 @@ $macalt = '' if !defined($macalt) || $mactest == 1; $line = "$macalt$line"; } else { - $expandedline .= "%$2"; + $expandedline .= "%$macorig"; } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root@suse.de