From 2ee22881483e84ea8b5ef0a5125631c04d174617 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 28 Nov 1999 19:14:45 +0000
Subject: no_comment

---
 perl-install/c/stuff.pm    |  1 +
 perl-install/c/stuff.xs.pm | 12 ++----------
 2 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'perl-install/c')

diff --git a/perl-install/c/stuff.pm b/perl-install/c/stuff.pm
index ea0320225..daf5d8ef3 100644
--- a/perl-install/c/stuff.pm
+++ b/perl-install/c/stuff.pm
@@ -23,6 +23,7 @@ sub headerGetEntry {
     $q eq 'size' and return headerGetEntry_int($h, RPMTAG_SIZE());
     $q eq 'filenames' and return headerGetEntry_string_list($h, RPMTAG_FILENAMES());
     $q eq 'obsoletes' and return headerGetEntry_string_list($h, RPMTAG_OBSOLETES());
+    $q eq 'requires' and return headerGetEntry_string_list($h, RPMTAG_REQUIRENAME());
 }
 
 1;
diff --git a/perl-install/c/stuff.xs.pm b/perl-install/c/stuff.xs.pm
index 93a9e8ab3..831b0c1c1 100644
--- a/perl-install/c/stuff.xs.pm
+++ b/perl-install/c/stuff.xs.pm
@@ -65,16 +65,8 @@ Xtest(display)
       XSetCloseDownMode(d, RetainPermanent);
       XCloseDisplay(d);
     }
-    { 
-	char *args[2]; 
-	args[0] = d ? "false" : "true"; /* inverted on purpose! */
-        args[1] = NULL;
-        execvp(args[0], args);
-    }
-    printf("***************** SHOUDNT GET THERE ***************\n");
-    exit(d != NULL);
+    _exit(d != NULL);
   }
-
   waitpid(pid, &RETVAL, 0);
   OUTPUT:
   RETVAL
@@ -628,7 +620,7 @@ headerGetEntry_string_list(h, query)
        VT_ACTIVATE VT_WAITACTIVE VT_GETSTATE CDROM_LOCKDOOR CDROMEJECT
        ) ],
 );
-push @macros, [ qw(int RPMTAG_NAME RPMTAG_GROUP RPMTAG_SIZE RPMTAG_VERSION RPMTAG_SUMMARY RPMTAG_DESCRIPTION RPMTAG_RELEASE RPMTAG_ARCH RPMTAG_FILENAMES RPMTAG_OBSOLETES) ]
+push @macros, [ qw(int RPMTAG_NAME RPMTAG_GROUP RPMTAG_SIZE RPMTAG_VERSION RPMTAG_SUMMARY RPMTAG_DESCRIPTION RPMTAG_RELEASE RPMTAG_ARCH RPMTAG_FILENAMES RPMTAG_OBSOLETES RPMTAG_REQUIRENAME) ]
   if $ENV{C_RPM};
 
 $\= "\n";
-- 
cgit v1.2.1