[packages/bmon] - updated to 3.6 - dropped obsolete patches - dropped devel subpackage (what was it for?) - updated

[baggins]

commit f29cabac6868e4ba06cf444c2f374748a8e5743e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Jan 2 14:07:23 2015 +0100

    - updated to 3.6
    - dropped obsolete patches
    - dropped devel subpackage (what was it for?)
    - updated BRs

 bmon-gcc4.patch     | 33 -------------------------------
 bmon-no-libnl.patch | 22 ---------------------
 bmon.spec           | 57 ++++++++++++++---------------------------------------
 3 files changed, 15 insertions(+), 97 deletions(-)
---
diff --git a/bmon.spec b/bmon.spec
index ad627b9..bf436d8 100644
--- a/bmon.spec
+++ b/bmon.spec
@@ -1,25 +1,18 @@
-
-%define	_pre	pre1
-%define	_sysconfdir	/etc/%{name}
 Summary:	Console interface bandwidth usage monitor
 Summary(pl.UTF-8):	Konsolowy monitor użycia interfejsu sieciowego
 Name:		bmon
-Version:	2.2.0
-Release:	0.%{_pre}.5
+Version:	3.6
+Release:	1
 License:	Artistic
 Group:		Applications/Networking
-Source0:	http://people.suug.ch/~tgr/bmon/files/%{name}-%{version}-%{_pre}.tar.gz
-# Source0-md5:	f4ec66927751027f855886f3dc45c218
-Patch0:		%{name}-gcc4.patch
-Patch1:		%{name}-no-libnl.patch
-URL:		http://people.suug.ch/~tgr/bmon/
+Source0:	https://github.com/tgraf/bmon/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
+# Source0-md5:	a78c2c75b194840036703907efd39e89
+URL:		https://github.com/tgraf/bmon/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	gettext-tools
-BuildRequires:	libdbi-devel
+BuildRequires:	libconfuse-devel
+BuildRequires:	libnl-devel
 BuildRequires:	ncurses-devel
-BuildRequires:	postgresql-devel
-BuildRequires:	rrdtool-devel >= 1.2.10
 Conflicts:	nstats
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,53 +39,33 @@ Pozwala on na generowanie i rysowanie trzech typów diagramów:
   interfejsu, takie jak całkowita liczba bajtów odebranych/wysłanych,
   błędy, skompresowane pakiety...
 
-%package devel
-Summary:	Header files for bmon
-Summary(pl.UTF-8):	Pliki nagłówkowe dla bmon
-Group:		Development/Libraries
-
-%description devel
-Header files neccesary to develop bmon applications.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe niezbędne do tworzenia aplikacji korzystających z
-bmon.
-
 %prep
-%setup -q -n %{name}-%{version}-%{_pre}
-%patch0 -p1
-%patch1 -p1
+%setup -q
 
 %build
-cp -f /usr/share/automake/config.sub .
-%{__gettextize}
+%{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__automake}
 %{__autoheader}
 %configure
-%{__make}
+%{__make} V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sysconfdir}
-install -d $RPM_BUILD_ROOT%{_includedir}/%{name}
-cp -r etc/* $RPM_BUILD_ROOT%{_sysconfdir}
-install include/%{name}/* $RPM_BUILD_ROOT%{_includedir}/%{name}/
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+cp -p examples/bmon.conf $RPM_BUILD_ROOT%{_sysconfdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/bmon.conf
 %attr(755,root,root) %{_bindir}/*
-%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
-%{_mandir}/man1/*
-
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/*
+%{_mandir}/man8/*
diff --git a/bmon-gcc4.patch b/bmon-gcc4.patch
deleted file mode 100644
index 7b6b47d..0000000
--- a/bmon-gcc4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- bmon-2.2.0-pre1.orig/src/attr.c	2009-08-11 12:39:11.174098517 +0200
-+++ bmon-2.2.0-pre1/src/attr.c	2009-08-11 12:39:37.249973382 +0200
-@@ -33,7 +33,7 @@
- struct attr_map attrs[] = {
- 	[BYTES] = { .am_name = "bytes" },
- 	[PACKETS] = { .am_name = "packets" },
--	[ERRORS] = { .am_name "errors" },
-+	[ERRORS] = { .am_name = "errors" },
- 	[DROP] = { .am_name = "drop" },
- 	[FIFO] = { .am_name = "fifo" },
- 	[FRAME] = { .am_name = "frame" },
---- bmon-2.2.0-pre1.orig/src/out_xml_event.c	2009-08-11 12:39:11.174098517 +0200
-+++ bmon-2.2.0-pre1/src/out_xml_event.c	2009-08-11 12:52:26.458973199 +0200
-@@ -135,7 +135,7 @@
- 	.om_draw = xml_event_draw,
- 	.om_set_opts = xml_event_set_opts,
- 	.om_probe = xml_event_probe,
--	.om_shutdown xml_event_shutdown,
-+	.om_shutdown = xml_event_shutdown
- };
- 
- static void __init xml_event_init(void)
---- bmon-2.2.0-pre1.orig/src/out_audio.c	2009-08-11 12:39:11.174098517 +0200
-+++ bmon-2.2.0-pre1/src/out_audio.c	2009-08-11 12:52:53.630973273 +0200
-@@ -141,7 +141,7 @@
- 	.om_draw = audio_draw,
- 	.om_set_opts = audio_set_opts,
- 	.om_probe = audio_probe,
--	.om_shutdown audio_shutdown,
-+	.om_shutdown = audio_shutdown
- };
- 
- static void __init audio_init(void)
diff --git a/bmon-no-libnl.patch b/bmon-no-libnl.patch
deleted file mode 100644
index 1ef5d3b..0000000
--- a/bmon-no-libnl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- bmon-2.2.0-pre1.orig/configure.ac	2009-08-11 12:39:11.172098193 +0200
-+++ bmon-2.2.0-pre1/configure.ac	2009-08-11 13:13:15.358098088 +0200
-@@ -192,19 +192,6 @@
- ##
- #####################################################################
- NL="No "
--AC_CHECK_LIB(nl, nl_connect, [
--	AC_DEFINE_UNQUOTED(HAVE_NL, "1", [have libnl])
--	LIBNL="-lnl"
--	NL="Yes"
--],[
--	case ${target_os} in
--	    *linux*)
--		echo
--		echo "*** Warning: Building bmon on Linuxx w/o libnl ***"
--		echo
--	    ;;
--	esac
--])
- 
- #####################################################################
- ##
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bmon.git/commitdiff/f29cabac6868e4ba06cf444c2f374748a8e5743e