Date: Wed, 23 Feb 2022 10:13:07 GMT From: Dima Panov <fluffy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3eb5190da948 - main - archivers/rpm4: fix packaging for plugins (+) Message-ID: <202202231013.21NAD7XN084746@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=3eb5190da9480f160171c7063890265f3b5b8572 commit 3eb5190da9480f160171c7063890265f3b5b8572 Author: Dima Panov <fluffy@FreeBSD.org> AuthorDate: 2022-02-23 10:06:40 +0000 Commit: Dima Panov <fluffy@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202231013.21NAD7XN084746>