OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 09-Jun-2003 17:16:09
Branch: HEAD Handle: 2003060916160900
Modified files:
openpkg-re src2make.pl
Log:
flush old changes (don't know anything more about them, but anyway)
Summary:
Revision Changes Path
1.45 +8 -3 openpkg-re/src2make.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/src2make.pl
============================================================================
$ cvs diff -u -r1.44 -r1.45 src2make.pl
--- openpkg-re/src2make.pl 11 Jan 2003 11:05:54 -0000 1.44
+++ openpkg-re/src2make.pl 9 Jun 2003 15:16:09 -0000 1.45
@@ -312,6 +312,7 @@
# remember all provides of current package
# virtual1 ->+ this, ..., virtualN ->+ this
foreach my $prov (@{$pkg_prov}) {
+ $prov =~ s|\s+\S+\s+\S+\s*$||s;
$prov =~ s|\s+.*$||s;
$PGV->{$prov} = [] if (not defined($PGV->{$prov}));
push(@{$PGV->{$prov}}, $srcrpm_name);
@@ -669,7 +670,11 @@
# generate build command
$MF .= "[EMAIL PROTECTED] \"\$(TERM_B):::: Building $pkg ::::\$(TERM_N)\"\n";
- $MF .= "\tcd \$(SRC) && (echo \"Build Time: \`date\`\"; \$(RPM_RD) --rebuild
$pkg.src.rpm 2>&1) | tee \$(LOG)/$pkg.log.\$(HOSTNAME).\$(PLATFORM)\n";
+ $MF .= "\tcd \$(SRC) && (echo \"Build Start: \`date\`\"; " .
+ "echo \"$pkg\" >\$(LOG)/processing.\$(HOSTNAME).\$(PLATFORM); " .
+ "\$(RPM_RD) --rebuild $pkg.src.rpm 2>&1; " .
+ "echo \"Build End: \`date\`\") | " .
+ "tee \$(LOG)/$pkg.log.\$(HOSTNAME).\$(PLATFORM)\n";
# generate build epilog (installation of dependencies)
if (not $nouninstall) {
@@ -718,7 +723,7 @@
# generate uninstall operation
if (not $nouninstall and not $pkg_name eq 'openpkg') {
$MF .= "[EMAIL PROTECTED] \"\$(TERM_B):::: Uninstalling $pkg
::::\$(TERM_N)\"\n";
- $MF .= "\t\$(RPM_RD) -q $pkg >/dev/null && \$(RPM_RW) -e $pkg >/dev/null
2>&1 || true\n";
+ $MF .= "\t\$(RPM_RD) -q $pkg >/dev/null && \$(RPM_RW) -e --noscripts $pkg
>/dev/null 2>&1 || true\n";
}
$il = '';
@@ -890,7 +895,7 @@
$MF .= "# erase\n" .
"erase:\n" .
- "[EMAIL PROTECTED]"`\$(PREFIX)/bin/rpm -qa | grep -v openpkg`\"; \\\n" .
+ "[EMAIL PROTECTED]"`\$(PREFIX)/bin/rpm -qa --qf '[%{NAME}\\n]' | grep -v
'^openpkg\$\$'`\"; \\\n" .
"\tif [ \".\$\$PKG\" != . ]; then \\\n" .
"\t awk 'BEGIN { printf(\"Erasing all packages \"); }' </dev/null 1>&2;
\\\n" .
"\t while [ 1 ]; do \\\n" .
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
