From 1fb83351026f30fe8d7c374a4e851ae1f30d1987 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 15 Dec 2008 15:32:42 +0000 Subject: - adapt tests to rpm 4.6: o old suggests format is no more handled o buildroot handling changed o build directories for root changed - fix buildroot_default.spec: was broken since %{rpm_version} is not defined --- t/data/SPECS/buildroot_BuildRoot.spec | 39 ----------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 t/data/SPECS/buildroot_BuildRoot.spec (limited to 't/data/SPECS/buildroot_BuildRoot.spec') diff --git a/t/data/SPECS/buildroot_BuildRoot.spec b/t/data/SPECS/buildroot_BuildRoot.spec deleted file mode 100644 index bf686480..00000000 --- a/t/data/SPECS/buildroot_BuildRoot.spec +++ /dev/null @@ -1,39 +0,0 @@ -%define macro_using_buildroot $(echo %buildroot) - -Summary: x -Name: buildroot_BuildRoot -Version: 1 -Release: 1 -License: x -Group: x -Url: x -BuildRoot: %{_tmppath}/TESTING-%{version}-%{release} - -%description -x - -%package sub - -Summary: x -Group: x -Version: 2 -Release: 2 - -%description sub -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 - -%files -/etc/foo -- cgit v1.2.1