From nobody Mon Feb 28 13:19:17 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6E01019FEA57; Mon, 28 Feb 2022 13:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K6gvT2MCZz4XZQ; Mon, 28 Feb 2022 13:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646054357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=186i1m9YSNXW3w73SN9m+b/F508/cUM0t2w553QB9c0=; b=b5hmqCVc/RbcyxJdZsRe3ZhFNWQK1UFwrP0Zc9r37egRSyYmT2YUFUO1zQ6hRsfzChQAeF EibH+QtygBwjpwpIvq5pFJPD8vYa6DGUhGxFdT76oE/UcQwOuQQ7qFWfuaFNOEBbyJvCmM W+iTnquy1d3kzrg16juu9kR+0vPl88goib6roajwc03Nj3bF/7x0hvXQLxue3dg/34AYWU 3de3WzozH81pb7z3kZFDyMrg72jA8KX1a8Hudnqb+B1uCtrQuxkwVOCxG+SNIUgwXu/mF1 DAwj5W7W/8NFH9B5dcP6Cu0rmrdgEt2u3c2TBGYRa62w4xfpZfumw47xoaqjJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2C97F1B9E8; Mon, 28 Feb 2022 13:19:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21SDJH6f097075; Mon, 28 Feb 2022 13:19:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21SDJHE0097074; Mon, 28 Feb 2022 13:19:17 GMT (envelope-from git) Date: Mon, 28 Feb 2022 13:19:17 GMT Message-Id: <202202281319.21SDJHE0097074@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 371aef9619e1 - main - archivers/rpm4: fix python bindings List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 371aef9619e152a131b77b25b1bbb5859d474932 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646054357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=186i1m9YSNXW3w73SN9m+b/F508/cUM0t2w553QB9c0=; b=GwI0e7OlN93yNABzpKOG2h+lZVDTtPVNWXV/9XTRHIswCnorPWvYKAQXj/xR4SwfHWu1mu xGUXkZ0+N40ZZtDPGJeU78X5zmIsK0LKL8pdt0tEUd2nPFXdnHR0nUSNK1mkAY0kZtfaCi Jsqxm49KA1RJjVQvOdY2ldgIfdOJ3CaSJdGTNZWUIf9p9QYd0dn9/E5ZbY1ww0zKyBYIF+ LLLfnkA2UPLnk6PDQRQo32n+zcZofb6OAW5BNt8Ta9fh1KRhtgbsKQzbjVCEP9L79inmyk f4OeNU8NPTqtOvix5yb9uaLxwKwrmlELVunspNYalx3ndxjzkQpoQSgAp6Ffgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646054357; a=rsa-sha256; cv=none; b=IRMc/9r42YXVA+XX7763bzP2zQ4qxO5VTHkDyn/dB3g2K8veCO5B0ofaU9yj/qlm3pqD9/ 3dQOuAJIjajsKDG+Rmx0vv2EIz6PEoMdIWnN9UOzEK9EQIBVvsK3njgiX22KZgYQpqrbts OMQ6EA6LLsJfMSwMMhzlykUPal1xNFfu/sWpt5qZj47yDid4u3AN/093OTf3H4xc0e21Ei JssLYIo5/flTUJIKvFfPM/Xfqb0eWLtOuSMx3/AhEuCByXkVmcubfXwdPxPSAcupyrxh5y tJYziH0zZkOHZa15CMs3wFdfAReVq+vTH7HwJL9Xm1O4VsSW7E3JyMnYZ1pSRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=371aef9619e152a131b77b25b1bbb5859d474932 commit 371aef9619e152a131b77b25b1bbb5859d474932 Author: Dmitry Marakasov AuthorDate: 2022-02-24 17:27:24 +0000 Commit: Dmitry Marakasov CommitDate: 2022-02-28 13:18:52 +0000 archivers/rpm4: fix python bindings Fix regression introduced in 468b96c: - Reenable python bindings which are still available in this package - Remove dependency on py-python-rpm-packaging as it's not related to the bindings and is not required for this port operation PR: 262173 Approved by: portmgr blanket (regression) --- archivers/rpm4/Makefile | 7 ++++--- archivers/rpm4/pkg-plist | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 3fb61d729fad..38c677173b77 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -2,7 +2,7 @@ PORTNAME= rpm PORTVERSION= 4.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/ PKGNAMESUFFIX= 4 @@ -59,12 +59,13 @@ OPTIONS_DEFINE= PYTHON PLUGINS NLS DOCS OPTIONS_DEFAULT=PYTHON OPTIONS_SUB= yes +PYTHON_CONFIGURE_ENABLE=python +PYTHON_USES= python + NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_LIBS= -lintl -PYTHON_RUN_DEPENDS= ${LOCALBASE}/lib/rpm/pythondistdeps.py:archivers/py-python-rpm-packaging - PLUGINS_CONFIGURE_ENABLE=plugins PLUGINS_LIB_DEPENDS= libdbus-1.so:devel/dbus diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index 04f7b1405a09..4222cee5a1cd 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -59,6 +59,9 @@ lib/librpmio.so.9.2.0 lib/librpmsign.so lib/librpmsign.so.9 lib/librpmsign.so.9.2.0 +%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py %%PLUGINS%%lib/rpm-plugins/dbus_announce.so %%PLUGINS%%lib/rpm-plugins/prioreset.so %%PLUGINS%%lib/rpm-plugins/syslog.so