Failed merge

Merge branch 'master' into el4
2011-11-28 17:59:15 +04:00 · 2011-11-28 17:37:44 +04:00 · 2011-11-28 16:41:03 +04:00 · 2010-07-28 14:34:41 +00:00 · 2010-07-12 23:12:55 +00:00 · 2010-07-12 22:22:24 +00:00
2 changed files with 1 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-flow-tools-0.68.5.tar.bz2
 /flow-tools-0.68.5.1.tar.bz2
--- a/flow-tools.spec
+++ b/flow-tools.spec
@ -1,5 +1,3 @@
-%bcond_without  fedora
-
 %global uid 40
 %global username flow-tools
 %global homedir %{_localstatedir}/%{name}
@ -16,7 +14,7 @@ Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1: flow-capture.init
 Source2: flow-capture.sysconfig
 BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel 
-BuildRequires: bison flex tcp_wrappers-devel
+BuildRequires: bison flex tcp_wrappers
 BuildRequires: fedora-usermgmt-devel doxygen
 %{?FE_USERADD_REQ}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Author	SHA1	Message	Date
Paul P. Komkoff	fdd9f95558	Failed merge	2011-11-28 17:59:15 +04:00
Paul P. Komkoff	e33a99e8cb	Failed merge	2011-11-28 17:37:44 +04:00
Paul P. Komkoff	9a82e01609	Merge branch 'master' into el4 Conflicts: .gitignore flow-tools.spec sources	2011-11-28 16:41:03 +04:00
Fedora Release Engineering	f308bb3dec	dist-git conversion	2010-07-28 14:34:41 +00:00
Orion Poplawski	5d6e693e64	Drop unused and EL-4 incompatible %bcond macro	2010-07-12 23:12:55 +00:00
Orion Poplawski	0ebba29fc0	Use tcp_wrappers (not -devel) on EL-4	2010-07-12 22:22:24 +00:00
Orion Poplawski	9153569fb3	Update to 0.68.5	2010-07-12 15:09:55 +00:00
Kevin Fenzi	ab5549a98e	Initialize branch EL-4 for flow-tools	2010-07-09 18:24:44 +00:00
Bill Nottingham	90cfde5ebd	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:28:21 +00:00
Paul P Komkoff Jr	2824539018	Fix flow report 72 (by reaper@surnet.ru) bz#212928	2006-11-23 05:57:36 +00:00
Paul P Komkoff Jr	e662f13d4c	Split patches in more convenient way (and bug upstream) Fix 2 unitialized variable bugs	2006-06-18 16:12:22 +00:00
Paul P Komkoff Jr	b552770265	Fix flow-capture segfaults on platforms with 64bit time_t	2005-10-31 21:11:37 +00:00
Paul P Komkoff Jr	23f00c57e0	Update FC3 and FC4 versions	2005-10-20 13:22:14 +00:00