do not use builrequires dash-static, use gcc to build a special binary, so

that we are less mandriva centered

1 files changed, 17 insertions, 16 deletions

diff --git a/t/superuser--ordering-scriptlets.t b/t/superuser--ordering-scriptlets.t
index 53e3c7cc..ae9c81a7 100644
--- a/t/superuser--ordering-scriptlets.t
+++ b/t/superuser--ordering-scriptlets.t
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+# /bin/a in package is a simple "cat"
 use strict;
 use lib '.', 't';
 use helper;
@@ -9,8 +10,8 @@ my $medium_name = 'ordering-scriptlets';
 
 need_root_and_prepare();
 
-my $ash_1 = "media/$medium_name/ordering_ash-1-*.rpm";
-my $ash_2 = "media/$medium_name/ordering_ash-2-*.rpm";
+my $a_1 = "media/$medium_name/a-1-*.rpm";
+my $a_2 = "media/$medium_name/a-2-*.rpm";
 
 test_install_remove_rpm("requires_$_") foreach qw(pre post preun postun);
 test_install_upgrade_rpm("requires_$_") foreach qw(preun postun);
@@ -24,29 +25,29 @@ test_install_upgrade_urpmi("requires_$_", '--split-level 1') foreach qw(preun po
 sub test_install_remove_rpm {
     my ($name) = @_;
 
-    system_("rpm --root $::pwd/root -i $ash_1 media/$medium_name/$name-1-*.rpm");
-    check_installed_and_remove('ordering_ash', $name);
+    system_("rpm --root $::pwd/root -i $a_1 media/$medium_name/$name-1-*.rpm");
+    check_installed_and_remove('a', $name);
 
-    system_("rpm --root $::pwd/root -i media/$medium_name/$name-1-*.rpm $ash_1");
-    check_installed_and_remove($name, 'ordering_ash');
+    system_("rpm --root $::pwd/root -i media/$medium_name/$name-1-*.rpm $a_1");
+    check_installed_and_remove($name, 'a');
 }
 
 sub test_install_upgrade_rpm {
     my ($name) = @_;
 
-    system_("rpm --root $::pwd/root -i $ash_1 media/$medium_name/$name-1-*.rpm");
-    system_("rpm --root $::pwd/root -U media/$medium_name/$name-2-*.rpm $ash_2");
-    check_installed_and_remove('ordering_ash', $name);
+    system_("rpm --root $::pwd/root -i $a_1 media/$medium_name/$name-1-*.rpm");
+    system_("rpm --root $::pwd/root -U media/$medium_name/$name-2-*.rpm $a_2");
+    check_installed_and_remove('a', $name);
 
 
-    system_("rpm --root $::pwd/root -i media/$medium_name/$name-1-*.rpm $ash_1");
-    system_("rpm --root $::pwd/root -U $ash_2 media/$medium_name/$name-2-*.rpm");
-    check_installed_and_remove($name, 'ordering_ash');
+    system_("rpm --root $::pwd/root -i media/$medium_name/$name-1-*.rpm $a_1");
+    system_("rpm --root $::pwd/root -U $a_2 media/$medium_name/$name-2-*.rpm");
+    check_installed_and_remove($name, 'a');
 }
 
 sub test_install_remove_urpmi {
     my ($name, $urpmi_option) = @_;
-    my @names = ('ordering_ash', $name);
+    my @names = ('a', $name);
     my @names_rev = reverse @names;
 
     urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
@@ -62,16 +63,16 @@ sub test_install_remove_urpmi {
 
 sub test_install_upgrade_urpmi {
     my ($name, $urpmi_option) = @_;
-    my @names = ('ordering_ash', $name);
+    my @names = ('a', $name);
     my @names_rev = reverse @names;
 
     urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
 
-    system_("rpm --root $::pwd/root -i $ash_1 media/$medium_name/$name-1-*.rpm");
+    system_("rpm --root $::pwd/root -i $a_1 media/$medium_name/$name-1-*.rpm");
     urpmi(join(' ', $urpmi_option, @names));
     check_installed_and_urpme(@names);
 
-    system_("rpm --root $::pwd/root -i $ash_1 media/$medium_name/$name-1-*.rpm");
+    system_("rpm --root $::pwd/root -i $a_1 media/$medium_name/$name-1-*.rpm");
     urpmi(join(' ', $urpmi_option, @names_rev));
     check_installed_and_urpme(@names_rev);