From b1a0e3cd9959953c874d14917f97f293c83e6e0f Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 20 Oct 2007 06:07:50 +0000
Subject: [PATCH 1/4] Initialize branch F-8 for flow-tools

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..e9e7ccd
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-8

From 1de6fdb91de2b80c25dae6a6ac6d948fd09f833e Mon Sep 17 00:00:00 2001
From: Paul P Komkoff Jr <stingray@fedoraproject.org>
Date: Mon, 12 Nov 2007 22:33:23 +0000
Subject: [PATCH 2/4] flow-tools 0.68.3-1

---
 .cvsignore      |  2 +-
 flow-tools.spec | 16 +++++++++++++---
 sources         |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index dfa1622..d8635a5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flow-tools-0.68.1.tar.bz2
+flow-tools-0.68.3.tar.bz2
diff --git a/flow-tools.spec b/flow-tools.spec
index 9137b60..c050e54 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -5,10 +5,10 @@
 %global homedir %{_localstatedir}/%{name}
 %global gecos "Network flow monitoring"
 
-Version: 0.68.1
+Version: 0.68.3
 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}/
@@ -107,7 +107,7 @@ fi
 
 %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}/*
@@ -129,6 +129,16 @@ fi
 %{_includedir}/*.h
 
 %changelog
+* Mon Nov 12 2007 Paul P Komkoff Jr <i@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@stingr.net> - 0.68.2-1
+- New upstream release
+
 * Thu Sep 13 2007 Orion Poplawski <orion@cora.nwra.com> - 0.68.1-2
 - Add user and init scripts
 
diff --git a/sources b/sources
index 70affe8..47cd63e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8388d0f81ce49e4ca97d9f79da3a2a5  flow-tools-0.68.1.tar.bz2
+c5f9c940da66685341718c0b8518bbde  flow-tools-0.68.3.tar.bz2

From 573f357800e62ed1ef92ee078cd185308b635114 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:28:21 +0000
Subject: [PATCH 3/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3535a42..5323001 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := flow-tools
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From d730c71b112d061a77fa35d1fd65241355c484d9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 14:34:38 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5323001..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: flow-tools
-# $Id$
-NAME := flow-tools
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index e9e7ccd..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-8