rpms/flow-tools/F-7 .cvsignore, 1.3, 1.4 flow-tools.spec, 1.16, 1.17 sources, 1.3, 1.4

[Paul P Komkoff Jr (stingray)]

Author: stingray

Update of /cvs/extras/rpms/flow-tools/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8009/F-7

Modified Files:
	.cvsignore flow-tools.spec sources 
Log Message:
flow-tools 0.68.3-1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/F-7/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Aug 2007 10:58:52 -0000	1.3
+++ .cvsignore	12 Nov 2007 22:33:19 -0000	1.4
@@ -1 +1 @@
-flow-tools-0.68.1.tar.bz2
+flow-tools-0.68.3.tar.bz2


Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/F-7/flow-tools.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- flow-tools.spec	5 Aug 2007 10:58:52 -0000	1.16
+++ flow-tools.spec	12 Nov 2007 22:33:19 -0000	1.17
@@ -1,4 +1,11 @@
-Version: 0.68.1
+%bcond_without  fedora
+
+%global uid 40
+%global username flow-tools
+%global homedir %{_localstatedir}/%{name}
+%global gecos "Network flow monitoring"
+
+Version: 0.68.3
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
 Release: 1%{?dist}
@@ -6,10 +13,20 @@
 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
+BuildRequires: fedora-usermgmt-devel
+%{?FE_USERADD_REQ}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Requires(post): initscripts chkconfig
+Requires(preun): initscripts chkconfig
+Requires(postun): initscripts
+Provides: group(%username) = %uid
+Provides: user(%username) = %uid
+
 
 %description
 Flow-tools is library and a collection of programs used to collect, 
@@ -56,17 +73,41 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
+install -d $RPM_BUILD_ROOT%{_initrddir}
+install -m 0755 %SOURCE1 $RPM_BUILD_ROOT%{_initrddir}/flow-capture
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 0644 %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/flow-capture
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
+%pre
+%__fe_groupadd %uid -r %username &>/dev/null || :
+%__fe_useradd  %uid -r -s /sbin/nologin -d %homedir -M          \
+                    -c '%gecos' -g %username %username &>/dev/null || :
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add flow-capture
+
+%preun
+if [ $1 = 0 ]; then
+        /sbin/service flow-capture stop >/dev/null 2>&1
+        /sbin/chkconfig --del flow-capture
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+        /sbin/service flow-capture condrestart >/dev/null 2>&1 || :
+fi
 
-%postun -p /sbin/ldconfig
+%__fe_userdel  %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
 
 %files 
 %defattr(-,root,root)
-%doc README README.fork INSTALL TODO COPYING SECURITY ChangeLog ChangeLog.old 
+%doc README README.fork INSTALL TODO COPYING SECURITY ChangeLog ChangeLog.old
 %doc docs/*.html
 %{_mandir}/man1/*
 %{_bindir}/*
@@ -76,7 +117,9 @@
 %dir %{_sysconfdir}/%{name}/sym/
 %config(noreplace) %{_sysconfdir}/%{name}/cfg/*
 %config(noreplace) %{_sysconfdir}/%{name}/sym/*
-%{_localstatedir}/%{name}/
+%config(noreplace) %{_sysconfdir}/sysconfig/flow-capture
+%{_initrddir}/flow-capture
+%attr(-,flow-tools,flow-tools) %{_localstatedir}/%{name}/
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/*
 
@@ -86,6 +129,19 @@
 %{_includedir}/*.h
 
 %changelog
+* Mon Nov 12 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.3-1
+- new upstream release
+- build tools as PIE
+- get rid of ftpaths.h
+- do not ship ftconfig.c
+- do not require libft
+
+* Sat Nov  3 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.2-1
+- New upstream release
+
+* Thu Sep 13 2007 Orion Poplawski <orion at cora.nwra.com> - 0.68.1-2
+- Add user and init scripts
+
 * Sun Aug  5 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.1-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/F-7/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Aug 2007 10:58:52 -0000	1.3
+++ sources	12 Nov 2007 22:33:19 -0000	1.4
@@ -1 +1 @@
-b8388d0f81ce49e4ca97d9f79da3a2a5  flow-tools-0.68.1.tar.bz2
+c5f9c940da66685341718c0b8518bbde  flow-tools-0.68.3.tar.bz2