- fix more shebangs, remove duplicate global var, rel 8

[packages/flow-tools.git] / flow-tools.spec

diff --git a/flow-tools.spec b/flow-tools.spec
index e858a8b405564c59e0d3f812d5c297d0615a84ee..221baafe03318193bde92ac2e0291be1b02fe9c7 100644 (file)
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -2,12 +2,15 @@ Summary:      Collecting and processing NetFlow data
 Summary(pl.UTF-8):     Gromadzenie i przetwarzanie informacji o przepływie w sieci
 Name:          flow-tools
 Version:       0.68.5
-Release:       3
+Release:       8
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://flow-tools.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5: 3c5e75da2822ab6b4947c928c09ea365
 Patch0:                %{name}-shebang.patch
+Patch1:                format-security.patch
+Patch2:                openssl.patch
+Patch3:                duplicate-def.patch
 URL:           http://code.google.com/p/flow-tools/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -18,7 +21,6 @@ BuildRequires:        libwrap-devel >= 7.6-32
 BuildRequires: mysql-devel
 BuildRequires: openssl-devel
 BuildRequires: rpm-pythonprov
-BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,8 +72,15 @@ Statyczna biblioteka flow-tools.
 
 %prep
 %setup -q
-
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+      bin/flow-log2rrd \
+      bin/flow-rpt2rrd \
+      bin/flow-rptfmt
 
 %build
 %{__libtoolize}