- fix cmake generated paths

- rel 2

diff --git a/cmake.patch b/cmake.patch
new file mode 100644 (file)
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}" )
+ 

diff --git a/wireshark.spec b/wireshark.spec
index 5550c0823f089b2bdd653836ed77bcd21a02d80a..1603f50e368c92f08dd7b04601fb66f7115f9c9a 100644 (file)
--- 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" \