SPECS: rtorrent.spec - merge from AC-branch: - ipv6 and colors bconds ena...

[adamg]

Author: adamg                        Date: Sat Jun  7 19:57:56 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge from AC-branch:
  - ipv6 and colors bconds enabled by default
  - dropped dns_peer_info patch
  - some fixes from gentoo
- release 2

---- Files affected:
SPECS:
   rtorrent.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: SPECS/rtorrent.spec
diff -u SPECS/rtorrent.spec:1.66 SPECS/rtorrent.spec:1.67
--- SPECS/rtorrent.spec:1.66	Sun May 11 18:52:16 2008
+++ SPECS/rtorrent.spec	Sat Jun  7 21:57:51 2008
@@ -1,22 +1,23 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	colors		# with color version
-%bcond_with	ipv6		# with IPv6 support (default IPv4-only)
 %bcond_with	xmlrpc		# build xmlrpc-c support
+%bcond_without	colors		# without color version
+%bcond_without	ipv6		# without IPv6 support
 #
 Summary:	rTorrent - a console-based BitTorrent client
 Summary(pl.UTF-8):	rTorrent - konsolowy klient BitTorrenta
 Name:		rtorrent
 Version:	0.8.2
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Networking
 Source0:	http://libtorrent.rakshasa.no/downloads/%{name}-%{version}.tar.gz
 # Source0-md5:	a2456182e1767e5aed7341dbbd058f60
 Patch0:		%{name}-colors.patch
-Patch1:		%{name}-dns_peer_info.patch
-Patch2:		%{name}-ssl-no-verify.patch
+Patch1:		%{name}-ssl-no-verify.patch
+Patch2:		%{name}-gcc43.patch
+Patch3:		%{name}-fix_start_stop_filter.patch
 URL:		http://libtorrent.rakshasa.no/
 BuildRequires:	automake
 BuildRequires:	curl-devel >= 7.12
@@ -46,8 +47,9 @@
 %if %{with colors}
 %patch0 -p1
 %endif
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 cp /usr/share/automake/config.sub .
@@ -80,6 +82,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2008-06-07 19:57:51  adamg
+- merge from AC-branch:
+  - ipv6 and colors bconds enabled by default
+  - dropped dns_peer_info patch
+  - some fixes from gentoo
+- release 2
+
 Revision 1.66  2008-05-11 16:52:16  areq
 - BR xmlrpc-c-devel >= 1.14.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rtorrent.spec?r1=1.66&r2=1.67&f=u