From nobody Wed Feb 23 10:13:07 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 1673B19D4C69; Wed, 23 Feb 2022 10:13:08 +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 4K3X0z6xnqz4kTC; Wed, 23 Feb 2022 10:13:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645611188; 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=wYSbqfaLEmzTga84MGqfH/iL/3Ra14IN527LX8iV6EE=; b=wd0ZjrY41SIv4Zd/mTrvK1S+2vw+Sstb5b7iFWzPxAEywfx08XGVK1ymi9WgVDaTwrmx8G ym4PcCtZtNWrhqN7pZvcwydSygn+CJTtblJOBBpxD/I0CWcFs7EZzY43qh30NW/0AMOlRZ LcmjSSYHByMUhqX7TvNCzqlx8gkhi3CF6GORBZvafvivdaJ6ChHsT5E6zMeOttf11FU7T4 PiEDmxPQfiyqn6NLpa8/JUjLM2sPAMSoKpHmffeDQbY3y8oHuiUQ0rsAx8jzV4Lme4OmvE wU3VvBPo+bCcH9EnRhmqYKiG7d7hCnIP6tF9O34vSwm2KP0Q9dEc2jrmhaB7Iw== 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 CFC9216719; Wed, 23 Feb 2022 10:13:07 +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 21NAD7J7084747; Wed, 23 Feb 2022 10:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NAD7XN084746; Wed, 23 Feb 2022 10:13:07 GMT (envelope-from git) Date: Wed, 23 Feb 2022 10:13:07 GMT Message-Id: <202202231013.21NAD7XN084746@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 3eb5190da948 - main - archivers/rpm4: fix packaging for plugins (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3eb5190da9480f160171c7063890265f3b5b8572 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645611188; 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=wYSbqfaLEmzTga84MGqfH/iL/3Ra14IN527LX8iV6EE=; b=aBd/nN/UsUetxoG9pFRa2tpHsdHT3YuF6VfCh+o+Lu379IwrwsBGfiee8rv3N/bT/Hlo7Y Gk08xPID+07jiKhY3Pi/wDXRp95EySb6u6FI6/gJVyqGK7jeG/agqcBM2RnEE/KDZ3ggKt B+U0f76lPbm9JhIJQ1iW4hhnl4Oi8Sr+5iziNv9pnH1/FpS0nrRG6VWoUN9/swvxRsLV1f +FymQ6ajs0DFIHIYgRvlOGsYvjcjl3Wb+HYrfnevw3nID2ZuebXlUPoRAvJoNDfJ8aH2au HgdhdcNPux5goZFMUkuPs+WYhhfor1Dc+M8IOFeWzS4ryN5ztWs0OdP3gDvljQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645611188; a=rsa-sha256; cv=none; b=ibObmEFqiZJPCTOnbnBu6k2wgv8OeKxV1cPaw79PZ+p6R+pxBYq9WsfVPuNc/A7YVCykIp 8j77pKIerShR4y7xaLtaKSjXO0ow3soCmRc5dqTUk9b9KCC4SmZAcQsnablQZkII+D1DxV z1dvmBdV2fkq7qSclsmcRtU4ceWo0AjEMaLFBfOHaRDzaxkbfAlq5MoDFgVAkAt8hOHafX yVF+mhMQ52xsB3Say6w0o1iDiA4Mjwk3KdVD17yuiquOFhtLMh4V7xElkryacQzVlxU+h/ 2mNomOY9YX20FWVSYHzkf6E4SQX1U0DSUYsgS7fBO5Ka7tVFuUL8A4ddRiTzHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eb5190da9480f160171c7063890265f3b5b8572 commit 3eb5190da9480f160171c7063890265f3b5b8572 Author: Dima Panov AuthorDate: 2022-02-23 10:06:40 +0000 Commit: Dima Panov CommitDate: 2022-02-23 10:13:00 +0000 archivers/rpm4: fix packaging for plugins (+) RPM installs plugins to separated subdir, and all of them was missed from plist. Moreover, with disabled PLUGINS option, listed manpages are missing. Fix it by wrap with sub macro. Bump PORTREVISION due to plist changes. Reporded by: poudriere build Pointy hat to: rodrigo (for not use poudriere to catch leftovers) Approved by: portmgr blanket (fix packaging) Sponsored by: Netzkommune GmbH --- archivers/rpm4/Makefile | 1 + archivers/rpm4/pkg-plist | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index e2f4f48220dd..3fb61d729fad 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -2,6 +2,7 @@ PORTNAME= rpm PORTVERSION= 4.17.0 +PORTREVISION= 1 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/ PKGNAMESUFFIX= 4 diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index 46ffa8e077c5..04f7b1405a09 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -10,6 +10,7 @@ bin/rpmquery bin/rpmsign bin/rpmspec bin/rpmverify +%%PLUGINS%%etc/dbus-1/system.d/org.rpm.conf include/rpm/argv.h include/rpm/header.h include/rpm/rpmarchive.h @@ -58,6 +59,10 @@ lib/librpmio.so.9.2.0 lib/librpmsign.so lib/librpmsign.so.9 lib/librpmsign.so.9.2.0 +%%PLUGINS%%lib/rpm-plugins/dbus_announce.so +%%PLUGINS%%lib/rpm-plugins/prioreset.so +%%PLUGINS%%lib/rpm-plugins/syslog.so +%%PLUGINS%%lib/rpm-plugins/systemd_inhibit.so lib/rpm/brp-elfperms lib/rpm/brp-compress lib/rpm/brp-remove-la-files @@ -176,6 +181,11 @@ man/ko/man8/rpm.8.gz man/ko/man8/rpm2cpio.8.gz man/man1/gendiff.1.gz man/man8/rpm-misc.8.gz +%%PLUGINS%%man/man8/rpm-plugin-dbus-announce.8.gz +%%PLUGINS%%man/man8/rpm-plugin-prioreset.8.gz +%%PLUGINS%%man/man8/rpm-plugin-syslog.8.gz +%%PLUGINS%%man/man8/rpm-plugin-systemd-inhibit.8.gz +%%PLUGINS%%man/man8/rpm-plugins.8.gz man/man8/rpm.8.gz man/man8/rpm2archive.8.gz man/man8/rpm2cpio.8.gz @@ -234,5 +244,6 @@ man/sk/man8/rpm.8.gz %%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo +%%PLUGINS%%@dir lib/rpm-plugins @dir lib/rpm/lua @dir lib/rpm/macros.d