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

fixed generation of man pages

Browse Source 
Resolves: #635878
This commit is contained in:
Jan Safranek 2010-09-24 16:13:23 +02:00
parent f4c5f253cf
commit 771ef26f8d
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wireshark-1.4.0-doc-path.patch Normal file
View File

@ -0,0 +1,19 @@
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.
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 ../tshark -G fields | \
$(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
capinfos.1: capinfos.pod ../config.h

9
wireshark.spec
View File

@ -16,7 +16,7 @@ Version: 1.4.0
%if %{svn_version} %if %{svn_version}
Release: 0.%{svn_version}%{?dist} Release: 0.%{svn_version}%{?dist}
%else %else
Release: 1%{?dist} Release: 2%{?dist}
%endif %endif
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
@ -36,6 +36,7 @@ Patch3: wireshark-1.2.4-enable_lua.patch
Patch4: wireshark-1.2.8-disable_warning_dialog.patch Patch4: wireshark-1.2.8-disable_warning_dialog.patch
Patch5: wireshark-libtool-pie.patch Patch5: wireshark-libtool-pie.patch
Patch6: wireshark-1.4.0-python.patch Patch6: wireshark-1.4.0-python.patch
Patch7: wireshark-1.4.0-doc-path.patch
Url: http://www.wireshark.org/ Url: http://www.wireshark.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -115,6 +116,7 @@ and plugins.
%patch4 -p1 -b .dialog %patch4 -p1 -b .dialog
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%build %build
%ifarch s390 s390x sparcv9 sparc64 %ifarch s390 s390x sparcv9 sparc64
@ -156,7 +158,7 @@ export LDFLAGS="$LDFLAGS -pie"
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
time make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -289,6 +291,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sbindir}/idl2wrs %{_sbindir}/idl2wrs
%changelog %changelog
* Fri Sep 24 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.0-2
- fixed generation of man pages (#635878)
* Tue Aug 31 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.0-1 * Tue Aug 31 2010 Jan Safranek <jsafrane@redhat.com> - 1.4.0-1
- upgrade to 1.4.0 - upgrade to 1.4.0
- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.0.html - see http://www.wireshark.org/docs/relnotes/wireshark-1.4.0.html