rpms/flow-tools/devel .cvsignore, 1.2, 1.3 flow-tools.spec, 1.15, 1.16 sources, 1.2, 1.3 flow-tools-0.68-0001-Fix-first-line-of-included-python-scripts.patch, 1.1, NONE flow-tools-0.68-0002-Fix-an-invalid-lvalue-in-assignment-compile-error.patch, 1.1, NONE flow-tools-0.68-0003-Avoid-external-debug-variable.patch, 1.1, NONE flow-tools-0.68-0004-Make-flow-tools-more-FHS-compliant-and-buildable-by-newer-toolchain.patch, 1.1, NONE flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch, 1.1, NONE flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch, 1.1, NONE flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch, 1.1, NONE flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch, 1.1, NONE flow-tools-0.68-getopt.patch, 1.1, NONE flow-tools-0.68.rpt72.patch, 1.1, NONE
Paul P Komkoff Jr (stingray)
fedora-extras-commits at redhat.com
Sun Jul 15 08:39:12 UTC 2007
Author: stingray
Update of /cvs/extras/rpms/flow-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4783
Modified Files:
.cvsignore flow-tools.spec sources
Removed Files:
flow-tools-0.68-0001-Fix-first-line-of-included-python-scripts.patch
flow-tools-0.68-0002-Fix-an-invalid-lvalue-in-assignment-compile-error.patch
flow-tools-0.68-0003-Avoid-external-debug-variable.patch
flow-tools-0.68-0004-Make-flow-tools-more-FHS-compliant-and-buildable-by-newer-toolchain.patch
flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch
flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
flow-tools-0.68-getopt.patch flow-tools-0.68.rpt72.patch
Log Message:
flow-tools-0.68.1-0.1.rc2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 7 Sep 2005 18:07:46 -0000 1.2
+++ .cvsignore 15 Jul 2007 08:38:40 -0000 1.3
@@ -1 +1 @@
-flow-tools-0.68.tar.gz
+flow-tools-0.68.1-rc2.tar.bz2
Index: flow-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/flow-tools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- flow-tools.spec 25 Mar 2007 08:21:00 -0000 1.15
+++ flow-tools.spec 15 Jul 2007 08:38:40 -0000 1.16
@@ -1,26 +1,16 @@
-Version: 0.68
+%define rcsuffix -rc2
+Version: 0.68.1
Name: flow-tools
Summary: Tool set for working with NetFlow data
-Release: 16%{?dist}
+Release: 0.1.rc2%{?dist}
Group: Applications/System
License: BSD
-URL: http://www.splintered.net/sw/flow-tools/
-Source0: ftp://ftp.eng.oar.net/pub/flow-tools/flow-tools-%{version}.tar.gz
-Patch1: flow-tools-0.68-0001-Fix-first-line-of-included-python-scripts.patch
-Patch2: flow-tools-0.68-0002-Fix-an-invalid-lvalue-in-assignment-compile-error.patch
-Patch3: flow-tools-0.68-0003-Avoid-external-debug-variable.patch
-Patch4: flow-tools-0.68-0004-Make-flow-tools-more-FHS-compliant-and-buildable-by-newer-toolchain.patch
-Patch5: flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch
-Patch6: flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch
-Patch7: flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch
-Patch8: flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch
-Patch9: flow-tools-0.68.rpt72.patch
-Patch10: flow-tools-0.68-getopt.patch
-
+URL: http://code.google.com/p/%{name}/
+Source0: http://%{name}.googlecode.com/files/%{name}-%{version}%{rcsuffix}.tar.bz2
Requires: rrdtool-python
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: openssl-devel mysql-devel postgresql-devel autoconf automake libtool zlib-devel bison flex tcp_wrappers
+BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel
+BuildRequires: bison flex tcp_wrappers
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%description
Flow-tools is library and a collection of programs used to collect,
@@ -49,28 +39,24 @@
libft.
%prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%setup -qn %{name}-%{version}%{rcsuffix}
%build
-autoreconf -f -i -s
-%configure --localstatedir=%{_localstatedir}/ft --sysconfdir=%{_sysconfdir}/flow-tools --enable-static=no --with-mysql --with-pgsql --with-openssl
+%configure \
+ --localstatedir=%{_localstatedir}/%{name} \
+ --sysconfdir=%{_sysconfdir}/%{name} \
+ --enable-static=no \
+ --with-mysql \
+ --with-postgresql \
+ --with-openssl
+
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
-%makeinstall localstatedir=$RPM_BUILD_ROOT%{_localstatedir}/ft sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir}/flow-tools
+make DESTDIR=$RPM_BUILD_ROOT install
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/ft
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -81,16 +67,19 @@
%files
%defattr(-,root,root)
-%doc README TODO COPYING SECURITY ChangeLog docs/*.html
+%doc README README.fork INSTALL TODO COPYING SECURITY ChangeLog ChangeLog.old
+%doc docs/*.html
%{_mandir}/man1/*
%{_bindir}/*
%{_libdir}/*.so.*
-%dir %{_sysconfdir}/flow-tools/
-%dir %{_sysconfdir}/flow-tools/cfg/
-%dir %{_sysconfdir}/flow-tools/sym/
-%config(noreplace) %{_sysconfdir}/flow-tools/cfg/*
-%config(noreplace) %{_sysconfdir}/flow-tools/sym/*
-%{_localstatedir}/ft/
+%dir %{_sysconfdir}/%{name}/
+%dir %{_sysconfdir}/%{name}/cfg/
+%dir %{_sysconfdir}/%{name}/sym/
+%config(noreplace) %{_sysconfdir}/%{name}/cfg/*
+%config(noreplace) %{_sysconfdir}/%{name}/sym/*
+%{_localstatedir}/%{name}/
+%dir %{_datadir}/%{name}/
+%{_datadir}/%{name}/*
%files devel
%defattr(-,root,root,-)
@@ -98,6 +87,11 @@
%{_includedir}/*.h
%changelog
+* Sun Jul 15 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68.1-0.1.rc2
+- Switch to 0.68.1 fork
+- Drop all patches
+- Sanitize spec
+
* Sun Mar 25 2007 Paul P Komkoff Jr <i at stingr.net> - 0.68-16
- getopt() is now in unistd.h
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flow-tools/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 7 Sep 2005 18:07:46 -0000 1.2
+++ sources 15 Jul 2007 08:38:40 -0000 1.3
@@ -1 +1 @@
-c9e0a8b53c79611b6bffcb9d510a5a38 flow-tools-0.68.tar.gz
+896a9debe94d02816c79c1482a741412 flow-tools-0.68.1-rc2.tar.bz2
--- flow-tools-0.68-0001-Fix-first-line-of-included-python-scripts.patch DELETED ---
--- flow-tools-0.68-0002-Fix-an-invalid-lvalue-in-assignment-compile-error.patch DELETED ---
--- flow-tools-0.68-0003-Avoid-external-debug-variable.patch DELETED ---
--- flow-tools-0.68-0004-Make-flow-tools-more-FHS-compliant-and-buildable-by-newer-toolchain.patch DELETED ---
--- flow-tools-0.68-0005-Fix-breakage-on-64bit-platforms.patch DELETED ---
--- flow-tools-0.68-0006-Fix-unitialized-variable-in-flow-send.patch DELETED ---
--- flow-tools-0.68-0007-Add-extra-debugging-to-ftpdu_verify.patch DELETED ---
--- flow-tools-0.68-0008-Fix-unitialized-variable-in-flow-export.c.patch DELETED ---
--- flow-tools-0.68-getopt.patch DELETED ---
--- flow-tools-0.68.rpt72.patch DELETED ---
More information about the scm-commits
mailing list