summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortron <tron>2010-09-05 16:13:41 +0000
committertron <tron>2010-09-05 16:13:41 +0000
commit7d867de41c45f50ee1de4b99dc0b7ce862249952 (patch)
tree1b3bcaf0129399fd733adaae72c742201bdbd1cd /mk
parent281c93784d881b34806c44bb0b3bce5c12c64bae (diff)
downloadpkgsrc-7d867de41c45f50ee1de4b99dc0b7ce862249952.tar.gz
Require at least version 3.1.3 of the "rpm2pkg" package to make sure we
support RPM package files which use LZMA compression for the data section.
Diffstat (limited to 'mk')
-rw-r--r--mk/emulator/pkg-rpm.mk4
-rw-r--r--mk/tools/replace.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/emulator/pkg-rpm.mk b/mk/emulator/pkg-rpm.mk
index 7e7c203ff6d..556a3c52f50 100644
--- a/mk/emulator/pkg-rpm.mk
+++ b/mk/emulator/pkg-rpm.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkg-rpm.mk,v 1.2 2007/10/09 19:19:13 martti Exp $
+# $NetBSD: pkg-rpm.mk,v 1.3 2010/09/05 16:13:41 tron Exp $
#
# RPM package format
#
@@ -56,7 +56,7 @@
# files listed in RPMFILES.
#
-BUILD_DEPENDS+= rpm2pkg>=2.1:../../pkgtools/rpm2pkg
+BUILD_DEPENDS+= rpm2pkg>=3.1.3:../../pkgtools/rpm2pkg
EVAL_PREFIX+= _RPM2PKG_PREFIX=rpm2pkg
RPM2PKG= ${_RPM2PKG_PREFIX}/sbin/rpm2pkg
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 55b5835e67c..89a1a2a1125 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.227 2010/06/13 22:45:03 wiz Exp $
+# $NetBSD: replace.mk,v 1.228 2010/09/05 16:13:41 tron Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -701,7 +701,7 @@ TOOLS_PATH.pod2man= ${TOOLS_PREFIX.pod2man}/bin/pod2man
. if !empty(PKGPATH:Mpkgtools/rpm2pkg)
MAKEFLAGS+= TOOLS_IGNORE.rpm2pkg=
. elif !empty(_TOOLS_USE_PKGSRC.rpm2pkg:M[yY][eE][sS])
-TOOLS_DEPENDS.rpm2pkg?= rpm2pkg>=2.1:../../pkgtools/rpm2pkg
+TOOLS_DEPENDS.rpm2pkg?= rpm2pkg>=3.1.3:../../pkgtools/rpm2pkg
TOOLS_CREATE+= rpm2pkg
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.rpm2pkg=rpm2pkg
TOOLS_PATH.rpm2pkg= ${TOOLS_PREFIX.rpm2pkg}/sbin/rpm2pkg