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

fixed generation of man pages again

Browse Source 
Resolves: #635878
This commit is contained in:
Jan Safranek 2010-12-06 13:41:05 +01:00
parent 15575571aa
commit 42b94425aa
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
635878: wireshark supplied filter manpage is empty 635878: wireshark supplied filter manpage is empty
tshark as executed by doc/Makefile tends to link with existing libraries in tshark as executed by doc/Makefile tends to link with existing libraries in
/usr/lib instead of just compiled libraries. /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. Point the linker to the right place using LD_LIBRARY_PATH.
@ -13,7 +14,7 @@ diff -up wireshark-1.4.0/doc/Makefile.in.orig wireshark-1.4.0/doc/Makefile.in
wireshark-filter.pod: wireshark-filter.pod.template ../tshark wireshark-filter.pod: wireshark-filter.pod.template ../tshark
- WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | \ - WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | \
+ WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 LD_LIBRARY_PATH=../epan/.libs ../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 $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
capinfos.1: capinfos.pod ../config.h capinfos.1: capinfos.pod ../config.h

5
wireshark.spec
View File

@ -16,7 +16,7 @@ Version: 1.4.2
%if %{svn_version} %if %{svn_version}
Release: 0.%{svn_version}%{?dist} Release: 0.%{svn_version}%{?dist}
%else %else
Release: 2%{?dist} Release: 3%{?dist}
%endif %endif
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
@ -317,6 +317,9 @@ fi
%{_sbindir}/idl2wrs %{_sbindir}/idl2wrs
%changelog %changelog
* Mon Dec 6 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.2-3
- fixed generation of man pages again (#635878)
* Fri Nov 26 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.2-2 * Fri Nov 26 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.2-2
- rework the Wireshark security (#657490). Remove the console helper and - rework the Wireshark security (#657490). Remove the console helper and
allow only members of new 'wireshark' group to capture the packets. allow only members of new 'wireshark' group to capture the packets.