From dc6ec24d046d91fd726c3c121fc58b7f5a207e6e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <or...@cora.nwra.com>
Date: Wed, 12 Apr 2017 11:27:45 -0600
Subject: Build properly with flow-tools support
---
perl-Cflow-flow-tools.patch | 26 ++++++++++++++++++++++++++
perl-Cflow.spec | 11 +++++++++--
2 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 perl-Cflow-flow-tools.patch
diff --git a/perl-Cflow-flow-tools.patch b/perl-Cflow-flow-tools.patch
new file mode 100644
index 0000000..03471b0
--- /dev/null
+++ b/perl-Cflow-flow-tools.patch
@@ -0,0 +1,26 @@
+diff -up Cflow-1.053/Makefile.PL.flow-tools Cflow-1.053/Makefile.PL
+--- Cflow-1.053/Makefile.PL.flow-tools 2017-04-12 11:17:56.305479722 -0600
++++ Cflow-1.053/Makefile.PL 2017-04-12 11:18:37.101280928 -0600
+@@ -42,18 +42,10 @@ sub find_argus_or_flow_tools {
+ sub find_flow_tools {
+ my($ver, $dir);
+ my($libdir, $incdir);
+- if (-f '../../lib/libft.a') {
+- $dir = '../../lib';
+- $incdir = "-I$dir -I$dir/..";
+- $libdir = "-L$dir";
+- }
+- if ("$libdir") {
+- print "Found flow-tools... using \"-DOSU $incdir $libdir -lft -lz\".\n";
+- return { CCFLAGS => $Config{ccflags} . ' -DOSU',
+- INC => join(' ', $incdir),
+- LIBS => [ join(' ', $libdir, '-lnsl -lft -lz') ] }
+- }
+- return undef
++ print "Found flow-tools... using \"-DOSU $incdir $libdir -lft\".\n";
++ return { CCFLAGS => $Config{ccflags} . ' -DOSU',
++ INC => join(' ', $incdir),
++ LIBS => [ join(' ', $libdir, '-lft') ] }
+ }
+
+ sub find_argus {
diff --git a/perl-Cflow.spec b/perl-Cflow.spec
index 30fc6a0..17f130d 100644
--- a/perl-Cflow.spec
+++ b/perl-Cflow.spec
@@ -1,6 +1,6 @@
Name: perl-Cflow
Version: 1.053
-Release: 32%{?dist}
+Release: 33%{?dist}
Summary: Find flows in raw IP flow files
Group: Development/Libraries
License: GPLv2+
@@ -8,6 +8,8 @@ URL: http://pages.cs.wisc.edu/~plonka/Cflow/
Source0: http://pages.cs.wisc.edu/~plonka/Cflow/Cflow-%{version}.tar.gz
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628522
Patch0: perl-Cflow-ccflags.patch
+# Use system flow-tools
+Patch1: perl-Cflow-flow-tools.patch
BuildRequires: perl-devel
BuildRequires: perl-generators
@@ -25,6 +27,7 @@ routers and written into flow files.
%prep
%setup -q -n Cflow-%{version}
%patch0 -p1
+%patch1 -p1 -b .flow-tools
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
@@ -44,7 +47,8 @@ chmod -R u+w $RPM_BUILD_ROOT/*
make test
%files
-%doc COPYING README Changes
+%license COPYING
+%doc README Changes
%{_bindir}/flowdumper
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Cflow.pm
@@ -53,6 +57,9 @@ make test
%changelog
+* Wed Apr 12 2017 Orion Poplawski <or...@cora.nwra.com> - 1.053-33
+- Build properly with flow-tools support
+
* Sat Feb 11 2017 Fedora Release Engineering <rel...@fedoraproject.org> -
1.053-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
--
cgit v1.1
https://src.fedoraproject.org/cgit/perl-Cflow.git/commit/?h=master&id=dc6ec24d046d91fd726c3c121fc58b7f5a207e6e
_______________________________________________
perl-devel mailing list -- perl-devel@lists.fedoraproject.org
To unsubscribe send an email to perl-devel-le...@lists.fedoraproject.org
