[wireshark/f14/master] fixed generation of man pages Resolves: #635878

[Jan Šafránek]

commit 5617f99e64eb68112a15453de38b599daaf886ea
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Fri Sep 24 16:13:23 2010 +0200

    fixed generation of man pages
    Resolves: #635878

 wireshark-1.4.0-doc-path.patch |   19 +++++++++++++++++++
 wireshark.spec                 |    9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/wireshark-1.4.0-doc-path.patch b/wireshark-1.4.0-doc-path.patch
new file mode 100644
index 0000000..183f2c4
--- /dev/null
+++ b/wireshark-1.4.0-doc-path.patch
@@ -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
diff --git a/wireshark.spec b/wireshark.spec
index ada96f3..0b8bb69 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -16,7 +16,7 @@ Version:	1.4.0
 %if %{svn_version}
 Release: 	0.%{svn_version}%{?dist}
 %else
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 %endif
 License: 	GPL+
 Group: 		Applications/Internet
@@ -36,6 +36,7 @@ Patch3:		wireshark-1.2.4-enable_lua.patch
 Patch4:		wireshark-1.2.8-disable_warning_dialog.patch
 Patch5:		wireshark-libtool-pie.patch
 Patch6:		wireshark-1.4.0-python.patch
+Patch7:		wireshark-1.4.0-doc-path.patch
 
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -115,6 +116,7 @@ and plugins.
 %patch4 -p1 -b .dialog
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %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|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-time make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -289,6 +291,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/idl2wrs
 
 %changelog
+* Fri Sep 24 2010 Jan Safranek <jsafrane at redhat.com> - 1.4.0-2
+- fixed generation of man pages (#635878)
+
 * Tue Aug 31 2010 Jan Safranek <jsafrane at redhat.com> - 1.4.0-1
 - upgrade to 1.4.0
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.4.0.html