[rtorrent/f13/master] Fix stray man page and build errors

[konradm]

commit 321f90bc3dae5fc7c6d6bd8abafba5235c090092
Author: Ankur Sinha <ankursinha at fedoraproject.org>
Date:   Thu Oct 28 23:07:38 2010 +0530

    Fix stray man page and build errors

 rtorrent.libxmlrpcFTBFS.patch |   34 ++++++++++++++++++++++++++++++----
 rtorrent.spec                 |    8 +++++++-
 2 files changed, 37 insertions(+), 5 deletions(-)
---
diff --git a/rtorrent.libxmlrpcFTBFS.patch b/rtorrent.libxmlrpcFTBFS.patch
index 7d4854e..0a62893 100644
--- a/rtorrent.libxmlrpcFTBFS.patch
+++ b/rtorrent.libxmlrpcFTBFS.patch
@@ -1,11 +1,37 @@
 diff -ur ../rtorrent-0.8.7.orig/src/Makefile.am ./src/Makefile.am
 --- ../rtorrent-0.8.7.orig/src/Makefile.am	2010-06-26 17:35:08.000000000 +0530
-+++ ./src/Makefile.am	2010-10-27 18:27:50.490639334 +0530
-@@ -46,6 +46,7 @@
++++ ./src/Makefile.am	2010-10-28 17:26:34.033639473 +0530
+@@ -45,7 +45,9 @@
+ 	display/libsub_display.a \
  	input/libsub_input.a \
  	rpc/libsub_rpc.a \
- 	utils/libsub_utils.a
-+	-lxmlrpc -lxmlrpc_util
+-	utils/libsub_utils.a
++	utils/libsub_utils.a \
++	-lxmlrpc -lxmlrpc_util \
++	-lpthread
+ 
+ rtorrent_SOURCES = \
+ 	main.cc
+diff -ur ../rtorrent-0.8.7.orig/src/Makefile.in ./src/Makefile.in
+--- ../rtorrent-0.8.7.orig/src/Makefile.in	2010-10-05 07:10:22.000000000 +0530
++++ ./src/Makefile.in	2010-10-28 18:45:59.409887695 +0530
+@@ -180,7 +180,7 @@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+-LIBTOOL = @LIBTOOL@
++LIBTOOL = @LIBTOOL@ 
+ LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -311,7 +311,9 @@
+ 	display/libsub_display.a \
+ 	input/libsub_input.a \
+ 	rpc/libsub_rpc.a \
+-	utils/libsub_utils.a
++	utils/libsub_utils.a \
++	-lxmlrpc -lxmlrpc_util \
++	-lpthread
  
  rtorrent_SOURCES = \
  	main.cc
diff --git a/rtorrent.spec b/rtorrent.spec
index c360b9b..9e063a5 100644
--- a/rtorrent.spec
+++ b/rtorrent.spec
@@ -3,7 +3,7 @@ Name:          rtorrent
 License:       GPLv2+ with exceptions
 Group:         Applications/Internet
 Version:       0.8.7
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       BitTorrent client based on libtorrent 
 URL:           http://rtorrent.rakshasa.no/
 Source0:       http://libtorrent.rakshasa.no/downloads/rtorrent-%{version}.tar.gz
@@ -43,6 +43,9 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# manually install the man page to correct location for this release
+install -p -m 0644 -D ./doc/rtorrent.1 $RPM_BUILD_ROOT/%{_mandir}/man1/rtorrent.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/rtorrent*
 
 %changelog
+* Thu Oct 28 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.8.7-3
+- manually install the man page to correct location
+
 * Wed Oct 27 2010 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.8.7-2
 - updated FTBFS patch for new version