From 42b94425aadad1908d05da6c20115227429ac632 Mon Sep 17 00:00:00 2001
From: Jan Safranek <jsafrane@redhat.com>
Date: Dec 06 2010 12:41:05 +0000
Subject: fixed generation of man pages again

Resolves: #635878

---

diff --git a/wireshark-1.4.0-doc-path.patch b/wireshark-1.4.0-doc-path.patch
index 183f2c4..5e0afae 100644
--- a/wireshark-1.4.0-doc-path.patch
+++ b/wireshark-1.4.0-doc-path.patch
@@ -1,7 +1,8 @@
 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.
+/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.
 
@@ -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_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
  
  capinfos.1: capinfos.pod ../config.h
diff --git a/wireshark.spec b/wireshark.spec
index 31d28ec..d86ec81 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -16,7 +16,7 @@ Version:	1.4.2
 %if %{svn_version}
 Release:	0.%{svn_version}%{?dist}
 %else
-Release:	2%{?dist}
+Release:	3%{?dist}
 %endif
 License:	GPL+
 Group:		Applications/Internet
@@ -317,6 +317,9 @@ fi
 %{_sbindir}/idl2wrs
 
 %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
 - rework the Wireshark security (#657490). Remove the console helper and
   allow only members of new 'wireshark' group to capture the packets.