summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Mazo <ahippo@yandex.com>2018-08-26 05:43:45 +0300
committerMichał Górny <mgorny@gentoo.org>2018-08-26 09:18:46 +0200
commit2738de9684d3ff84302cf005c5f6302258d272c2 (patch)
treeb1feed563ef6ca0a34b2a3528b92aecbe42a33f2
parentnet-analyzer/nload: patch to fix text sliding effect (diff)
downloadgentoo-2738de9684d3ff84302cf005c5f6302258d272c2.tar.gz
gentoo-2738de9684d3ff84302cf005c5f6302258d272c2.tar.bz2
gentoo-2738de9684d3ff84302cf005c5f6302258d272c2.zip
net-analyzer/nload: don't compress the man-page
As pointed out by @mgorny [1], packages should not compress their man pages on their own. Instead, Portage needs to handle the compression. Currently, `ecompressdir` is smart enough to recompress the man-pages as needed. However, this is not a fully PMS-compliant behavior. So, patch the Makefile.am not to compress the man-page. A corresponding pull request is submitted upstream [2]. [1] https://github.com/gentoo/gentoo/pull/9543#issuecomment-415662844 [2] https://github.com/rolandriegel/nload/pull/4 Closes: https://github.com/gentoo/gentoo/pull/9543
-rw-r--r--net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch65
-rw-r--r--net-analyzer/nload/nload-0.7.4-r1.ebuild1
2 files changed, 66 insertions, 0 deletions
diff --git a/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch b/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch
new file mode 100644
index 00000000000..705f92ea0e8
--- /dev/null
+++ b/net-analyzer/nload/files/nload-0.7.4-Makefile-spec-don-t-compress-man-page.patch
@@ -0,0 +1,65 @@
+From 04d5af489f998568553dc54f39c56ef740a27f1b Mon Sep 17 00:00:00 2001
+From: Andrey Mazo <ahippo@yandex.com>
+Date: Sun, 26 Aug 2018 00:00:35 +0300
+Subject: [PATCH 1/1] Makefile,spec: don't compress the man-page
+
+Package managers like to compress man-pages on their own,
+because the type of compression for man-pages is user-configurable.
+In particular, Gentoo [1] doesn't want packages to compress their man-pages.
+Gentoo Portage has workarounds for this,
+but this is not specified in Package Manager Specification and
+results in extra compression-decompression pass.
+
+RPM also compresses man-pages itself (in `brp-compress`)
+(and similarly recompresses them as needed)
+rather than relying on packages to install compressed man-pages.
+
+Automake can handle installation of man-pages without the explicit "install" target,
+so use the standard automake-provided way of installing man-pages.
+It's also smart enough to package `nload.1.in` automatically.
+
+Don't specify an explicit man-page extension in .spec file as recommended by Fedora.
+
+[1] https://github.com/gentoo/gentoo/pull/9543#issuecomment-415662844
+
+(cherry picked from commit 096df0d1282a8c8c535e730d28fe281ea290b58d)
+
+Upstream: https://github.com/rolandriegel/nload/pull/4
+---
+ docs/Makefile.am | 10 +---------
+ nload.spec.in | 2 +-
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index 646d438..9032a02 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,11 +1,3 @@
+ ## Helder Correia <helder.correia@netcabo.pt>
+
+-man1_MAN = nload.1
+-
+-install:
+- $(mkinstalldirs) $(DESTDIR)$(mandir)/man1
+- $(INSTALL_DATA) $(top_srcdir)/docs/$(PACKAGE).1 $(DESTDIR)$(mandir)/man1
+- gzip -f $(DESTDIR)$(mandir)/man1/$(PACKAGE).1
+-
+-uninstall:
+- rm $(DESTDIR)$(mandir)/man1/$(PACKAGE).1.gz
++man1_MANS = nload.1
+diff --git a/nload.spec.in b/nload.spec.in
+index 36496fd..53f6f19 100644
+--- a/nload.spec.in
++++ b/nload.spec.in
+@@ -41,7 +41,7 @@ rm -rf %{buildroot}
+ %defattr(-,root,root)
+ %doc AUTHORS COPYING ChangeLog NEWS README
+ %attr(0755,root,root) %{_bindir}/%{name}
+-%{_mandir}/man1/%{name}.1.gz
++%{_mandir}/man1/%{name}.1*
+
+
+ %changelog
+--
+2.16.4
+
diff --git a/net-analyzer/nload/nload-0.7.4-r1.ebuild b/net-analyzer/nload/nload-0.7.4-r1.ebuild
index 1de5b572103..70abf3184dd 100644
--- a/net-analyzer/nload/nload-0.7.4-r1.ebuild
+++ b/net-analyzer/nload/nload-0.7.4-r1.ebuild
@@ -20,6 +20,7 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${P}-tinfo.patch
"${FILESDIR}"/${P}-Eliminate-flicker-on-some-terminals.patch
+ "${FILESDIR}"/${P}-Makefile-spec-don-t-compress-man-page.patch
)
src_prepare() {