[flow-tools/el4] Failed merge

Paul Komkoff stingray at fedoraproject.org
Mon Nov 28 13:59:23 UTC 2011


commit fdd9f95558775031308b38a9a9f9afad0ce8d173
Author: Paul P. Komkoff <i at stingr.net>
Date:   Mon Nov 28 17:59:15 2011 +0400

    Failed merge

 flow-tools.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/flow-tools.spec b/flow-tools.spec
index 8b560b7..ddb6e5d 100644
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -14,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)


More information about the scm-commits mailing list