From ea80c4dacc91ca3ff576810824b7c0ee70145ebf Mon Sep 17 00:00:00 2001
From: Alfredo Cardigliano <cardigliano@ntop.org>
Date: Thu, 25 Jul 2019 11:59:01 +0200
Subject: Removed conflict with nprobe-dev

---
 packages/rpm/ndpi.spec.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages/rpm')

diff --git a/packages/rpm/ndpi.spec.in b/packages/rpm/ndpi.spec.in
index e93e73577..59cd5b0ad 100644
--- a/packages/rpm/ndpi.spec.in
+++ b/packages/rpm/ndpi.spec.in
@@ -4,7 +4,7 @@ Version: @PACKAGE_VERSION@
 Release: %{buildnumber}
 License: LGPL
 Group: Networking/Utilities
-Conflicts: nprobe-dev 
+Conflicts:
 URL: http://www.ntop.org/products/deep-packet-inspection/ndpi/
 Source: ndpi-%{version}.tgz
 Packager: Luca Deri <deri@ntop.org>
@@ -64,6 +64,7 @@ cp $HOME/nDPI/packages/etc/ld.so.conf.d/ndpi.conf $RPM_BUILD_ROOT/etc/ld.so.conf
 rm -rf $RPM_BUILD_ROOT/usr/local/sbin/ndpi
 strip $RPM_BUILD_ROOT%{bindir}/*
 rm -fr %{buildroot}%{includedir}/ndpi_win32.h
+#sed -i -e "s/#include \"ndpi_win32.h\"//g" %{buildroot}%{includedir}/ndpi_main.h
 
 %clean
 rm -fr $RPM_BUILD_ROOT
-- 
cgit v1.2.3