commit 2d1c32bf1581f1f476e5154bdb56efa1b0338f53
Author: Jakub Bogusz <[email protected]>
Date: Sun Jun 21 13:17:07 2020 +0200
- dropped cmake patch to fix .pc file (CMAKE_INSTALL_LIBDIR is relative to
prefix now); release 2
cmake.patch | 11 -----------
wireshark.spec | 4 +---
2 files changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index b753243..3402762 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -15,12 +15,11 @@ Summary(ru.UTF-8): Анализатор сетевого траффика
Summary(uk.UTF-8): Аналізатор мережевого трафіку
Name: wireshark
Version: 3.2.4
-Release: 1
+Release: 2
License: GPL v2+
Group: Networking/Utilities
Source0: https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
# Source0-md5: 4bbee1bdd5b88343733590fabfffddf3
-Patch0: cmake.patch
URL: https://www.wireshark.org/
BuildRequires: bcg729-devel
BuildRequires: bison
@@ -257,7 +256,6 @@ Pliki nagłówkowe bibliotek Wiresharka.
%prep
%setup -q
-%patch0 -p1
%build
install -d build
diff --git a/cmake.patch b/cmake.patch
deleted file mode 100644
index 76c43e2..0000000
--- a/cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wireshark-3.0.0/CMakeLists.txt~ 2019-02-28 18:56:38.000000000 +0100
-+++ wireshark-3.0.0/CMakeLists.txt 2019-03-28 22:59:33.037351621 +0100
-@@ -1473,7 +1473,7 @@
-
- set( prefix "${CMAKE_INSTALL_PREFIX}" )
- set( exec_prefix "\${prefix}" )
--set( libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}" )
-+set( libdir "${CMAKE_INSTALL_LIBDIR}" )
- set( includedir "\${prefix}/include" )
- set( plugindir "\${libdir}/wireshark/${PLUGIN_VERSION_DIR}" )
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wireshark.git/commitdiff/2d1c32bf1581f1f476e5154bdb56efa1b0338f53
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
