diff options
| -rw-r--r-- | t/02create_pkgs.t | 2 | ||||
| -rw-r--r-- | t/data/SPECS/buildroot_BuildRoot.spec | 4 | ||||
| -rw-r--r-- | t/data/SPECS/buildroot_default.spec | 4 |
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 |