diff options
| author | Alfredo Cardigliano <cardigliano@ntop.org> | 2019-07-25 11:59:01 +0200 |
|---|---|---|
| committer | Alfredo Cardigliano <cardigliano@ntop.org> | 2019-07-25 11:59:01 +0200 |
| commit | ea80c4dacc91ca3ff576810824b7c0ee70145ebf (patch) | |
| tree | ed5aa92ef8ac618fd373e4997c9c1274cbb46526 /packages | |
| parent | 7f66f1053f286d31418283b14868c1357fb2c1a4 (diff) | |
Removed conflict with nprobe-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/rpm/ndpi.spec.in | 3 |
1 files changed, 2 insertions, 1 deletions
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 |