rpms/wireshark
7
0
Fork 0
Code Issues Pull Requests Releases Activity

upgrade to 1.6.0

Browse Source
This commit is contained in:
Jan Safranek 2011-06-08 11:53:52 +02:00
parent 88fc6739db
commit 04a707ad5f
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wireshark-1.4.0-doc-path.patch
View File

@ -1,20 +0,0 @@
635878: wireshark supplied filter manpage is empty
tshark as executed by doc/Makefile tends to link with existing libraries in
/usr/lib instead of just compiled libraries. It's probably caused by
removed rpath...
Point the linker to the right place using LD_LIBRARY_PATH.
diff -up wireshark-1.4.0/doc/Makefile.in.orig wireshark-1.4.0/doc/Makefile.in
--- wireshark-1.4.0/doc/Makefile.in.orig 2010-08-30 00:19:25.000000000 +0200
+++ wireshark-1.4.0/doc/Makefile.in 2010-09-24 14:54:47.857565183 +0200
@@ -835,7 +835,7 @@ wireshark-filter.html: wireshark-filter.
wireshark-filter.pod > wireshark-filter.html
wireshark-filter.pod: wireshark-filter.pod.template ../tshark
- WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | \
+ WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 LD_LIBRARY_PATH=../epan/.libs:../wiretap/.libs:../wsutil/.libs ../tshark -G fields | \
$(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
capinfos.1: capinfos.pod ../config.h

15
wireshark.spec
View File

@ -10,7 +10,7 @@
Summary: Network traffic analyzer
Name: wireshark
Version: 1.4.7
Version: 1.6.0
Release: 1%{?dist}
License: GPL+
Group: Applications/Internet
@ -28,8 +28,7 @@ Source9: wiresharkdoc-256x256.png
Patch1: wireshark-nfsv41-cleanup.patch
Patch2: wireshark-1.2.4-enable_lua.patch
Patch3: wireshark-libtool-pie.patch
Patch4: wireshark-1.4.0-doc-path.patch
Patch5: wireshark-1.4.2-group-msg.patch
Patch4: wireshark-1.4.2-group-msg.patch
Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -96,15 +95,15 @@ and plugins.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
# disable NFS patch for now, remove if steved@redhat.com does not complain
#%patch1 -p1
%if %{with_lua}
%patch2 -p1 -b .enable_lua
%endif
%patch3 -p1
%patch4 -p1
%patch5 -p1 -b .group-msg
%patch4 -p1 -b .group-msg
%build
%ifarch s390 s390x sparcv9 sparc64
@ -322,6 +321,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs
%changelog
* Wed Jun 8 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.0-1
- upgrade to 1.6.0
- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.0.html
* Thu Jun 2 2011 Jan Safranek <jsafrane@redhat.com> - 1.4.7-1
- upgrade to 1.4.7
- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.7.html