The package rpms/wireshark.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/wireshark.git/commit/?id=3c2bdd3d4a4....
Change: -%ifarch s390 s390x sparcv9 sparc64
Thanks.
Full change: ============
commit 3c2bdd3d4a47ecfa88056cb517aac6ae5ed694e7 Author: Michal Ruprich mruprich@redhat.com Date: Tue May 15 13:44:47 2018 +0200
Fixed undefined reference error in tshark (rhbz#1573906) Correcting usage of build flags (rhbz#1548665)
diff --git a/wireshark-0007-install-path.patch b/wireshark-0007-install-path.patch new file mode 100644 index 0000000..7a07ecd --- /dev/null +++ b/wireshark-0007-install-path.patch @@ -0,0 +1,26 @@ +diff --git a/plugins/codecs/l16_mono/CMakeLists.txt b/plugins/codecs/l16_mono/CMakeLists.txt +index 99b3de3dcc..51589c37da 100644 +--- a/plugins/codecs/l16_mono/CMakeLists.txt ++++ b/plugins/codecs/l16_mono/CMakeLists.txt +@@ -28,7 +28,7 @@ set_source_files_properties( + ) + + include_directories( +- ${CMAKE_SOURCE_DIR}/codec ++ ${CMAKE_SOURCE_DIR}/codecs + ${CMAKE_CURRENT_SOURCE_DIR} + ) + +diff --git a/plugins/codecs/l16_mono/Makefile.am b/plugins/codecs/l16_mono/Makefile.am +index bbc2379eb3..0ad043cd44 100644 +--- a/plugins/codecs/l16_mono/Makefile.am ++++ b/plugins/codecs/l16_mono/Makefile.am +@@ -26,7 +26,7 @@ NONGENERATED_REGISTER_C_FILES = \ + NONGENERATED_C_FILES = \ + $(NONGENERATED_REGISTER_C_FILES) + +-wiretap_plugin_LTLIBRARIES = l16mono.la ++codecs_plugin_LTLIBRARIES = l16mono.la + + l16mono_la_SOURCES = \ + $(SRC_FILES) \ diff --git a/wireshark.spec b/wireshark.spec index 58cc895..543faf7 100644 --- a/wireshark.spec +++ b/wireshark.spec @@ -7,7 +7,7 @@ Summary: Network traffic analyzer Name: wireshark Version: 2.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL+ Url: http://www.wireshark.org/ @@ -32,6 +32,8 @@ Patch4: wireshark-0004-Restore-Fedora-specific-groups.patch Patch5: wireshark-0005-Fix-paths-in-a-wireshark.desktop-file.patch # Fedora-specific Patch6: wireshark-0006-Move-tmp-to-var-tmp.patch +#codecs installed in wrong path +Patch7: wireshark-0007-install-path.patch
BuildRequires: bzip2-devel BuildRequires: c-ares-devel @@ -151,18 +153,6 @@ and plugins. %autosetup -S git
%build -%ifarch s390 s390x sparcv9 sparc64 -export PIECFLAGS="-fPIE -fPIC" -%else -export PIECFLAGS="-fpie -fPIC" -%endif - -# FC5+ automatic -fstack-protector-all switch -export RPM_OPT_FLAGS=${RPM_OPT_FLAGS//-fstack-protector-strong/-fstack-protector-all} -export CFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE" -export CXXFLAGS="$RPM_OPT_FLAGS $CPPFLAGS $PIECFLAGS -D_LARGEFILE64_SOURCE" -export LDFLAGS="$RPM_OPT_FLAGS $LDFLAGS -pie -fPIC" - autoreconf -ivf
%configure \ @@ -321,6 +311,7 @@ fi %{_libdir}/wireshark/extcap/sshdump #the version wireshark uses to store plugins is only x.y, not .z %{_libdir}/wireshark/plugins/%{plugins_version}/epan/*.so +%{_libdir}/wireshark/plugins/%{plugins_version}/codecs/*.so %{_libdir}/wireshark/plugins/%{plugins_version}/wiretap/*.so %{_mandir}/man1/editcap.* %{_mandir}/man1/tshark.* @@ -372,6 +363,10 @@ fi %{_libdir}/pkgconfig/%{name}.pc
%changelog +* Tue May 15 2018 Michal Ruprich mruprich@redhat.com - 1:2.6.0-2 +- Fixed undefined reference error in tshark (rhbz#1573906) +- Correcting usage of build flags (rhbz#1548665) + * Fri Apr 27 2018 Michal Ruprich mruprich@redhat.com - 1:2.6.0-1 - New version 2.6.0 - Removed GeoIP support, libmaxminddb is used instead
arch-excludes@lists.fedoraproject.org