From dd8200698158cd065efddcd114f88214431d9b13 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 4 Jan 2014 00:54:13 +0000 Subject: Fix pkgname conflicts --- archivers/rpm4/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archivers/rpm4/Makefile') diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index f53ab58ecc61..5e8ee8ca6289 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -27,7 +27,7 @@ USE_BDB= 46+ INVALID_BDB_VER=51 GNU_CONFIGURE= yes USE_LDCONFIG= yes -CONFLICTS_INSTALL= rpm-[35].* +CONFLICTS_INSTALL= rpm-[35].* rpm5-* SHEBANG_FILES= scripts/brp-python-bytecompile scripts/check-prereqs \ scripts/check-rpaths-worker scripts/pythondeps.sh \ scripts/mono-find-requires scripts/mono-find-provides \ -- cgit v1.2.3