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

[notifications at fedoraproject.org]

>From 8d3073a077131538a540abc49ffacdebfb6bb84d Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating at fedoraproject.org>
Date: Wed, 17 Feb 2010 01:20:17 +0000
Subject: Initialize branch F-13 for flow-tools


diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13
-- 
cgit v0.10.2


>From 2977cc9ede1f5b700c4621a233413e248cab476d 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 b8c0cb937409c2f2696cec078adfbaf1d57c95b7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 14:34:41 +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 baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13
-- 
cgit v0.10.2


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