From 9aa07987fc423bd8d0cecf6943e9019092e5120e Mon Sep 17 00:00:00 2001 From: Boris Samorodov Date: Thu, 5 Oct 2006 18:53:43 +0000 Subject: Revert back previous commit of removing deleted ports from CONFLICTS variable. Give happy users just another chance to update their systems. Pointed out by: infofarmer, kris --- emulators/linux_base-f7/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'emulators/linux_base-f7') diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile index bf973338ec4d..34103dca9b6f 100644 --- a/emulators/linux_base-f7/Makefile +++ b/emulators/linux_base-f7/Makefile @@ -97,7 +97,9 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \ ALWAYS_KEEP_DISTFILES= yes .endif -CONFLICTS= linux_base-gentoo* linux_base-suse-9* +CONFLICTS= linux_base-7* linux_base-deb* linux_base-gentoo* \ + linux_base-rh-9* linux_base-suse-9* linux_base-8* \ + linux_base-fc3 linux_locale* ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes -- cgit v1.2.3