[packages/wireshark] - fix cmake generated paths - rel 2

baggins baggins at pld-linux.org
Thu Mar 28 23:01:31 CET 2019


commit 396a8e52d15caf5288cd50e02f835ae0d2f648fc
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 28 23:01:13 2019 +0100

    - fix cmake generated paths
    - rel 2

 cmake.patch    | 11 +++++++++++
 wireshark.spec |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/wireshark.spec b/wireshark.spec
index 5550c08..1603f50 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -31,11 +31,12 @@ Summary(ru.UTF-8):	Анализатор сетевого траффика
 Summary(uk.UTF-8):	Аналізатор мережевого трафіку
 Name:		wireshark
 Version:	3.0.0
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Networking/Utilities
 Source0:	https://www.wireshark.org/download/src/%{name}-%{version}.tar.xz
 # Source0-md5:	258d62ac7434d126dc497303c8f7961b
+Patch0:		cmake.patch
 URL:		https://www.wireshark.org/
 BuildRequires:	GeoIP-devel
 BuildRequires:	asciidoc
@@ -264,6 +265,7 @@ Pliki nagłówkowe bibliotek Wiresharka.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %cmake -G "Unix Makefiles" \
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..76c43e2
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,11 @@
+--- 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/396a8e52d15caf5288cd50e02f835ae0d2f648fc



More information about the pld-cvs-commit mailing list