summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2008-03-01 01:05:30 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2008-03-01 01:05:30 +0000
commitdc7f77a85166e88620993c701b40bd5d1ed7a2b8 (patch)
tree5d51e9df83780e9b64121c5e9f4dd59669074b35
parent162885a7ad8d12aa01fab2291ee3d6fabcb16236 (diff)
downloadurpmi-dc7f77a85166e88620993c701b40bd5d1ed7a2b8.tar
urpmi-dc7f77a85166e88620993c701b40bd5d1ed7a2b8.tar.gz
urpmi-dc7f77a85166e88620993c701b40bd5d1ed7a2b8.tar.bz2
urpmi-dc7f77a85166e88620993c701b40bd5d1ed7a2b8.tar.xz
urpmi-dc7f77a85166e88620993c701b40bd5d1ed7a2b8.zip
skip buildroot checks for rpm5.org
-rw-r--r--t/02create_pkgs.t2
-rw-r--r--t/data/SPECS/buildroot_BuildRoot.spec4
-rw-r--r--t/data/SPECS/buildroot_default.spec4
3 files changed, 9 insertions, 1 deletions
diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t
index d9411b3c..3a333686 100644
--- a/t/02create_pkgs.t
+++ b/t/02create_pkgs.t
@@ -63,7 +63,7 @@ sub rpmbuild {
my ($spec, $o_medium_name) = @_;
my $dir = getcwd();
- system_("rpmbuild --quiet --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $spec");
+ system_("rpmbuild --quiet --define 'rpm_version %(rpm -q --queryformat \"%{VERSION}\" rpm|sed -e \"s/\\\\.//g\")' --define '_topdir $dir/tmp' --define '_tmppath $dir/tmp' -bb --clean --nodeps $spec");
my ($name) = $spec =~ m!([^/]*)\.spec$!;
diff --git a/t/data/SPECS/buildroot_BuildRoot.spec b/t/data/SPECS/buildroot_BuildRoot.spec
index cc7b78ca..bf686480 100644
--- a/t/data/SPECS/buildroot_BuildRoot.spec
+++ b/t/data/SPECS/buildroot_BuildRoot.spec
@@ -23,10 +23,14 @@ Release: 2
x
%install
+%if %{rpm_version} >= 500
+echo This is Mandriva specific, skipping it for rpm5.org...
+%else
wanted=$(echo %{_tmppath}/TESTING-1-1 | sed 's!//!/!')
[ "%buildroot" = $wanted ] || { echo "buildroot should be $wanted instead of %buildroot"; exit 1; }
[ "$RPM_BUILD_ROOT" = $wanted ] || { echo "RPM_BUILD_ROOT should be $wanted instead of $RPM_BUILD_ROOT"; exit 1; }
[ "%macro_using_buildroot" = $wanted ] || { echo "macro_using_buildroot should be $wanted instead of %buildroot"; exit 1; }
+%endif
install -d $RPM_BUILD_ROOT/etc
echo foo > $RPM_BUILD_ROOT/etc/foo
diff --git a/t/data/SPECS/buildroot_default.spec b/t/data/SPECS/buildroot_default.spec
index e1fc7c78..94f10ded 100644
--- a/t/data/SPECS/buildroot_default.spec
+++ b/t/data/SPECS/buildroot_default.spec
@@ -22,10 +22,14 @@ Release: 2
x
%install
+%if %{rpm_version} >= 500
+echo This is Mandriva specific, skipping it for rpm5.org...
+%else
wanted=$(echo %{_tmppath}/buildroot-1-1-buildroot | sed 's!//!/!')
[ "%buildroot" = $wanted ] || { echo "buildroot should be $wanted instead of %buildroot"; exit 1; }
[ "$RPM_BUILD_ROOT" = $wanted ] || { echo "RPM_BUILD_ROOT should be $wanted instead of $RPM_BUILD_ROOT"; exit 1; }
[ "%macro_using_buildroot" = $wanted ] || { echo "macro_using_buildroot should be $wanted instead of %buildroot"; exit 1; }
+%endif
install -d $RPM_BUILD_ROOT/etc
echo foo > $RPM_BUILD_ROOT/etc/foo