- 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 46d5acd232745a7c7ed4eb75791cd50a6d9c2028..221baafe03318193bde92ac2e0291be1b02fe9c7 100644 (file)
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -1,27 +1,30 @@
 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
-Release:       3
+Version:       0.68.5
+Release:       8
 License:       BSD
 Group:         Applications/Networking
-Source0:       ftp://ftp.eng.oar.net/pub/flow-tools/%{name}-%{version}.tar.gz
-# Source0-md5: c9e0a8b53c79611b6bffcb9d510a5a38
-Patch0:                %{name}-shared.patch
-URL:           http://www.splintered.net/sw/flow-tools/
+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
 BuildRequires: bison
-BuildRequires: sed >= 4.0
 BuildRequires: flex
 BuildRequires: libtool
 BuildRequires: libwrap-devel >= 7.6-32
+BuildRequires: mysql-devel
+BuildRequires: openssl-devel
+BuildRequires: rpm-pythonprov
 BuildRequires: zlib-devel
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _localstatedir  %{_sysconfdir}/%{name}
-
 %description
 This is a software package for collecting and processing NetFlow data
 from Cisco and Juniper routers.
@@ -70,8 +73,14 @@ Statyczna biblioteka flow-tools.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
-%{__sed} -i -e '1s,#.*bin/python,#!%{__python},' bin/flow-log2rrd bin/flow-rpt2rrd bin/flow-rptfmt
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+      bin/flow-log2rrd \
+      bin/flow-rpt2rrd \
+      bin/flow-rptfmt
 
 %build
 %{__libtoolize}
@@ -79,8 +88,10 @@ Statyczna biblioteka flow-tools.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-#      --with-mysql
+%configure \
+       --sysconfdir=%{_sysconfdir}/%{name} \
+       --with-mysql \
+       --with-openssl
 %{__make}
 
 %install
@@ -97,14 +108,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog INSTALL NEWS README SECURITY TODO
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%doc AUTHORS ChangeLog ChangeLog.old INSTALL README README.fork SECURITY TODO
+%attr(755,root,root) %{_bindir}/flow-*
+%attr(755,root,root) %{_datadir}/%{name}
+%{_mandir}/man1/flow-*.1*
 
 %files libs
 %defattr(644,root,root,755)
+%{_sysconfdir}/%{name}
 %attr(755,root,root) %{_libdir}/libft.so.*.*.*
-%{_localstatedir}
+%attr(755,root,root) %ghost %{_libdir}/libft.so.0
 
 %files devel
 %defattr(644,root,root,755)