From 2eb5f74cc79e0a67367d7df51d0e13fa730c3754 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 4 Oct 2020 18:49:57 +0200 Subject: [PATCH] - added config-no-L patch (drop -Llibdir from `pcap-config --libs` output); release 2 --- libpcap-config-no-L.patch | 39 +++++++++++++++++++++++++++++++++++++++ libpcap.spec | 8 +++++--- 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 libpcap-config-no-L.patch diff --git a/libpcap-config-no-L.patch b/libpcap-config-no-L.patch new file mode 100644 index 0000000..bbd08b9 --- /dev/null +++ b/libpcap-config-no-L.patch @@ -0,0 +1,39 @@ +--- libpcap-1.9.1/pcap-config.in.orig 2019-09-30 16:38:32.000000000 +0200 ++++ libpcap-1.9.1/pcap-config.in 2020-10-04 18:47:22.296076892 +0200 +@@ -59,16 +59,16 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir -lpcap $LIBS" ++ echo "-I$includedir -lpcap $LIBS" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $LIBS" ++ echo "-I$includedir $LIBS" + elif [ "$show_cflags" = 1 ] + then + echo "-I$includedir" + elif [ "$show_libs" = 1 ] + then +- echo "-L$libdir -lpcap $LIBS" ++ echo "-lpcap $LIBS" + elif [ "$show_additional_libs" = 1 ] + then + echo "$LIBS" +@@ -80,7 +80,7 @@ + # + if [ "$show_cflags" = 1 -a "$show_libs" = 1 ] + then +- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME" ++ echo "-I$includedir -l$PACKAGE_NAME" + elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ] + then + echo "-I$includedir" +@@ -89,6 +89,6 @@ + echo "-I$includedir" + elif [ "$show_libs" = 1 ] + then +- echo "-L$libdir $RPATH -l$PACKAGE_NAME" ++ echo "-l$PACKAGE_NAME" + fi + fi diff --git a/libpcap.spec b/libpcap.spec index 2aaf42a..cdfb5ca 100644 --- a/libpcap.spec +++ b/libpcap.spec @@ -12,14 +12,15 @@ Summary(ru.UTF-8): Предоставляет доступ к сетевым и Summary(uk.UTF-8): Надає доступ до мережевих інтерфейсів в promiscuous-режимі Name: libpcap Version: 1.9.1 -Release: 1 +Release: 2 Epoch: 2 License: BSD Group: Libraries Source0: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz # Source0-md5: 21af603d9a591c7d96a6457021d84e6c Patch0: %{name}-usb.patch -Patch1: %{name}-pf_ring.patch +Patch1: %{name}-config-no-L.patch +Patch2: %{name}-pf_ring.patch URL: http://www.tcpdump.org/ BuildRequires: autoconf >= 2.64 BuildRequires: automake @@ -156,7 +157,8 @@ Biblioteka statyczna libpcap. %prep %setup -q %patch0 -p1 -%{?with_pfring:%patch1 -p0} +%patch1 -p1 +%{?with_pfring:%patch2 -p0} %build cp -f /usr/share/automake/config.sub . -- 2.44.0