orion pushed to flow-tools (epel7). "flow-tools-0.68.4.1-1: Upstream update, -rrdtool package split"

[notifications at fedoraproject.org]

>From 1f4bb0e79dd976b090c0a66f2b3cf46605c6c5dd Mon Sep 17 00:00:00 2001
From: Paul P Komkoff Jr <stingray at fedoraproject.org>
Date: Mon, 2 Feb 2009 17:53:14 +0000
Subject: flow-tools-0.68.4.1-1: Upstream update, -rrdtool package split


diff --git a/.cvsignore b/.cvsignore
index cab314e..98b866e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flow-tools-0.68.4.tar.bz2
+flow-tools-0.68.4.1.tar.bz2
diff --git a/flow-tools.spec b/flow-tools.spec
index 2f6b1ce..b40ff52 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -5,17 +5,16 @@
 %global homedir %{_localstatedir}/%{name}
 %global gecos "Network flow monitoring"
 
-Version: 0.68.4
+Version: 0.68.4.1
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
 Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1: flow-capture.init
 Source2: flow-capture.sysconfig
-Requires: rrdtool-python
 BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel 
 BuildRequires: bison flex tcp_wrappers-devel
 BuildRequires: fedora-usermgmt-devel doxygen
@@ -54,6 +53,39 @@ contributed and are included in the distribution.
 This package contains header files required to build applications that use
 libft.
 
+%package rrdtool
+Summary: Scripts for flow-tools to build rrd graphs
+Group: Applications/System
+Requires: %{name} = %{version}-%{release} rrdtool-python
+
+%description rrdtool
+Flow-tools is library and a collection of programs used to collect,
+send, process, and generate reports from NetFlow data. The tools can be
+used together on a single server or distributed to multiple servers for
+large deployments. The flow-toools library provides an API for development
+of custom applications for NetFlow export versions 1,5,6 and the 14 currently
+defined version 8 subversions. A Perl and Python interface have been
+contributed and are included in the distribution.
+
+This package contains scripts that use python-rrdtool to create rrds and graphs
+from flow data.
+
+%package docs
+Summary: HTML and other redundant docs for flow-tools
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
+
+%description docs
+Flow-tools is library and a collection of programs used to collect,
+send, process, and generate reports from NetFlow data. The tools can be
+used together on a single server or distributed to multiple servers for
+large deployments. The flow-toools library provides an API for development
+of custom applications for NetFlow export versions 1,5,6 and the 14 currently
+defined version 8 subversions. A Perl and Python interface have been
+contributed and are included in the distribution.
+
+This package contains additional documentation, such as man pages in html format.
+
 %prep
 %setup -q
 
@@ -66,6 +98,9 @@ libft.
   --with-postgresql \
   --with-openssl
 
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
@@ -107,10 +142,53 @@ fi
 
 %files 
 %defattr(-,root,root)
-%doc README README.fork INSTALL TODO COPYING SECURITY ChangeLog ChangeLog.old
-%doc docs/*.html
-%{_mandir}/man1/*
-%{_bindir}/*
+%doc README README.fork COPYING ChangeLog
+%{_mandir}/man1/flow-capture.1*
+%{_mandir}/man1/flow-cat.1*
+%{_mandir}/man1/flow-dscan.1*
+%{_mandir}/man1/flow-expire.1*
+%{_mandir}/man1/flow-export.1*
+%{_mandir}/man1/flow-fanout.1*
+%{_mandir}/man1/flow-filter.1*
+%{_mandir}/man1/flow-gen.1*
+%{_mandir}/man1/flow-header.1*
+%{_mandir}/man1/flow-import.1*
+%{_mandir}/man1/flow-mask.1*
+%{_mandir}/man1/flow-merge.1*
+%{_mandir}/man1/flow-nfilter.1*
+%{_mandir}/man1/flow-print.1*
+%{_mandir}/man1/flow-receive.1*
+%{_mandir}/man1/flow-report.1*
+%{_mandir}/man1/flow-rptfmt.1*
+%{_mandir}/man1/flow-send.1*
+%{_mandir}/man1/flow-split.1*
+%{_mandir}/man1/flow-stat.1*
+%{_mandir}/man1/flow-tag.1*
+%{_mandir}/man1/flow-tools-examples.1*
+%{_mandir}/man1/flow-tools.1*
+%{_mandir}/man1/flow-xlate.1*
+%{_bindir}/flow-capture
+%{_bindir}/flow-cat
+%{_bindir}/flow-dscan
+%{_bindir}/flow-expire
+%{_bindir}/flow-export
+%{_bindir}/flow-fanout
+%{_bindir}/flow-filter
+%{_bindir}/flow-gen
+%{_bindir}/flow-header
+%{_bindir}/flow-import
+%{_bindir}/flow-mask
+%{_bindir}/flow-merge
+%{_bindir}/flow-nfilter
+%{_bindir}/flow-print
+%{_bindir}/flow-receive
+%{_bindir}/flow-report
+%{_bindir}/flow-rptfmt
+%{_bindir}/flow-send
+%{_bindir}/flow-split
+%{_bindir}/flow-stat
+%{_bindir}/flow-tag
+%{_bindir}/flow-xlate
 %{_libdir}/*.so.*
 %dir %{_sysconfdir}/%{name}/
 %dir %{_sysconfdir}/%{name}/cfg/
@@ -128,7 +206,22 @@ fi
 %{_libdir}/*.so
 %{_includedir}/*.h
 
+%files rrdtool
+%defattr(-,root,root)
+%{_bindir}/flow-rpt2rrd
+%{_bindir}/flow-log2rrd
+%{_mandir}/man1/flow-rpt2rrd.1*
+%{_mandir}/man1/flow-log2rrd.1*
+
+%files docs
+%defattr(-,root,root)
+%doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
+
 %changelog
+* Mon Feb  2 2009 Paul P Komkoff Jr <i at stingr.net> - 0.68.4.1-1
+- fix for pcap generation, by Dave Plonka
+- split out -rrdtool subpackage, for those who don't need rrdtool on their servers.
+
 * Sat Jan 24 2009 Caolán McNamara <caolanm at redhat.com> - 0.68.4-2
 - rebuild for dependencies
 
diff --git a/sources b/sources
index 87d5125..3a5ebef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5741720ad01b5a83a9bb7eaa991dcbb6  flow-tools-0.68.4.tar.bz2
+cee8aac4deb62953270183db2643cbb4  flow-tools-0.68.4.1.tar.bz2
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/flow-tools.git/commit/?h=epel7&id=1f4bb0e79dd976b090c0a66f2b3cf46605c6c5dd