fix --makeproxy

openpkg/mkproxyrpm.pl

@@ -31,7 +31,7 @@ use Getopt::Long;
 use IO;
 
 my $progname = "mkproxyrpm";
-my $progvers = "0.9.1";
+my $progvers = "0.9.2";
 
 #   parameters (defaults)
 my $version = 0;
@@ -158,7 +158,7 @@ if ($#ARGV != -1) {
 if (not -d $tmpdir) {
     &runcmd("mkdir $tmpdir && chmod 0700 $tmpdir")
         || die "cannot create temporary directory '$tmpdir'";
-    &cleanup_remember("rm -rf $tmpdir");
+    &cleanup_remember("rmdir $tmpdir");
 }
 &verbose("-- $tmpdir"); 
 
@@ -245,10 +245,14 @@ $lprefix =~ s|/+$||s;
 
 #   prepare build environment
 &verbose("++ establishing temporary RPM environment");
-&runcmd("mkdir $tmpdir/src");
-&runcmd("mkdir $tmpdir/tmp");
-&runcmd("mkdir $tmpdir/bld");
-&runcmd("mkdir $tmpdir/pkg");
+&runcmd("rm -rf $tmpdir/src; mkdir $tmpdir/src");
+&runcmd("rm -rf $tmpdir/tmp; mkdir $tmpdir/tmp");
+&runcmd("rm -rf $tmpdir/bld; mkdir $tmpdir/bld");
+&runcmd("rm -rf $tmpdir/pkg; mkdir $tmpdir/pkg");
+&cleanup_remember("rm -rf $tmpdir/src");
+&cleanup_remember("rm -rf $tmpdir/tmp");
+&cleanup_remember("rm -rf $tmpdir/bld");
+&cleanup_remember("rm -rf $tmpdir/pkg");
 my $macro = new IO::File (">$tmpdir/.rpmmacros");
 $macro->print("%_sourcedir $tmpdir/src\n" .
               "%_specdir   $tmpdir/src\n" .

openpkg/openpkg.spec

@@ -39,8 +39,8 @@
 #   o any cc(1)
 
 #   the package version and release
-%define       V_openpkg 20020620
-%define       R_openpkg 20020620
+%define       V_openpkg 20020625
+%define       R_openpkg 20020625
 
 #   the used software versions
 %define       V_rpm     4.0.2

openpkg/rpmx.pl

@@ -606,8 +606,8 @@ sub op_fetch {
 sub op_makeproxy {
     my ($CFG) = @_;
 
-    if ($#{$CFG->{ARG}} ne 0) {
-        print STDERR "rpm: option --makeproxy requires at least one argument\n";
+    if ($#{$CFG->{ARG}} != 0) {
+        print STDERR "rpm: option --makeproxy requires exactly one argument\n";
         return 1;
     }
     my $perl    = $^X;