orion pushed to flow-tools (epel7). "Merge remote branch 'origin/el6/master'"

[notifications at fedoraproject.org]

>From ee13a2d48ab81c2e876658e724c57aadda584263 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting at fedoraproject.org>
Date: Thu, 26 Nov 2009 01:28:20 +0000
Subject: Fix typo that causes a failure to update the common directory.
 (releng     #2781)


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))
-- 
cgit v0.10.2


>From 3c0b7aa391d157a86b20f136b2d3e53fddaedada Mon Sep 17 00:00:00 2001
From: Paul P Komkoff Jr <stingray at fedoraproject.org>
Date: Thu, 25 Feb 2010 14:18:15 +0000
Subject: flow-tools-0.68.5-1


diff --git a/.cvsignore b/.cvsignore
index 98b866e..05baf6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-flow-tools-0.68.4.1.tar.bz2
+flow-tools-0.68.5.tar.bz2
diff --git a/flow-tools.spec b/flow-tools.spec
index c0d709a..d1d6ea1 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.4.1
+Version: 0.68.5
 Name: flow-tools
 Summary: Tool set for working with NetFlow data
-Release: 4%{?dist}
+Release: 1%{?dist}
 Group: Applications/System
 License: BSD 
 URL: http://code.google.com/p/%{name}/
@@ -218,6 +218,9 @@ fi
 %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
 
 %changelog
+* Thu Feb 25 2010 Paul P Komkoff Jr <i at stingr.net> - 0.68.5
+- bunch of fixes from upstream
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.68.4.1-4
 - rebuilt with new openssl
 
diff --git a/sources b/sources
index 3a5ebef..bc93b26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cee8aac4deb62953270183db2643cbb4  flow-tools-0.68.4.1.tar.bz2
+3c5e75da2822ab6b4947c928c09ea365  flow-tools-0.68.5.tar.bz2
-- 
cgit v0.10.2


>From b365e1bacdc7c783e91b1ad26daf16c809929e77 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin at fedoraproject.org>
Date: Fri, 9 Jul 2010 18:24:40 +0000
Subject: Initialize branch EL-6 for flow-tools


diff --git a/branch b/branch
new file mode 100644
index 0000000..46381b9
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-6
-- 
cgit v0.10.2


>From 5d82bfbaff14982a5ca127b071da3c2c868f9c77 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 14:34:53 +0000
Subject: dist-git conversion


diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 05baf6d..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-flow-tools-0.68.5.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..05baf6d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+flow-tools-0.68.5.tar.bz2
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 46381b9..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-6
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/flow-tools.git/commit/?h=epel7&id=b4629d3fd7af7309616716e6682f8d4f0d403260