Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net-analyzer/nload: version bump to 0.7.5_pre20180309 #35063

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions net-analyzer/nload/Manifest
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
DIST nload-0.7.4.tar.gz 151005 BLAKE2B a98903652e21d2b9b2e446bfc8c8f5fc66559b6663893603f4040c6e80c8c977d305e952dc0108c9efa66490dfba91e42857337095ddb731ececf2e3747e0b97 SHA512 ca3e36d3f77c5a7994a3261042fb65a1458a29c769e6bebbe3b8e49b3045aca6f4d047065d11431b28368e0d881c24c92533fa24f0e54ac270f1f5bccfb5c0af
DIST nload-0.7.5_pre20180309.tar.gz 43405 BLAKE2B b5d8aeffc5de52c8574a8d11f133b2c5a38d09fd5a1abb75e2a9ea99551b018947844348ab73a26d806c575a387f1d4a5354144612ac7ea0f45bab5bd7d05115 SHA512 5942d706ac1f8acf57c832ee832a6b96add3c3d80fb45d3a5f6eb2397d20d49c4cc52e754328259bb52b06bd4e4b15e92d86103a531ae4ac546fcb87e3e5131b
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
Upstream: https://github.com/rolandriegel/nload/pull/4

From 096df0d1282a8c8c535e730d28fe281ea290b58d 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
---
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 706636e..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_builddir)/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 794e5e7..29ab486 100644
--- a/nload.spec.in
+++ b/nload.spec.in
@@ -41,7 +41,7 @@ rm -rf %{buildroot}
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog README.md
%attr(0755,root,root) %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/%{name}.1*


%changelog
--
2.43.0

10 changes: 10 additions & 0 deletions net-analyzer/nload/files/nload-0.7.5_pre-tinfo.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@
esac

dnl Checks for libraries.
+PKG_CHECK_MODULES([NCURSES],[ncurses],[LIBS="$LIBS $NCURSES_LIBS"],[AC_MSG_ERROR([ncurses was not found])])
AC_CHECK_LIB(ncurses, initscr)
AC_CHECK_LIB(form, new_form)

3 changes: 3 additions & 0 deletions net-analyzer/nload/metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="github">rolandriegel/nload</remote-id>
</upstream>
</pkgmetadata>
36 changes: 36 additions & 0 deletions net-analyzer/nload/nload-0.7.5_pre20180309.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

inherit autotools

GIT_REV="8f92dc04fad283abdd2a4538cd4c2093d957d9da"

DESCRIPTION="Real time network traffic monitor for the command line interface"
HOMEPAGE="http://www.roland-riegel.de/nload/index.html https://github.com/rolandriegel/nload"
SRC_URI="https://github.com/rolandriegel/nload/archive/${GIT_REV}.tar.gz -> ${P}.tar.gz"

LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"

RDEPEND=">=sys-libs/ncurses-5.2:0="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"

PATCHES=(
"${FILESDIR}"/${PN}-0.7.5_pre-tinfo.patch
"${FILESDIR}"/${PN}-0.7.5_pre-Makefile-spec-don-t-compress-man-page.patch
)

S="${WORKDIR}/${PN}-${GIT_REV}"

src_prepare() {
default
sed -i \
-e "/AC_INIT/ s/0\.7\.4/${PV} (Gentoo)/" \
configure.ac \
|| die "Failed to patch configure.ac"
eautoreconf
}