[rb_libtorrent/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 243150dcf096d19571415f78be0623499587bd3f
Merge: c8d2c18 ba0ee35
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 25 09:18:14 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	rb_libtorrent-0.14.10-py27.patch
    	rb_libtorrent.spec
    	sources

 .gitignore                          |    3 +-
 rb_libtorrent-0.14.10-py27-am.patch |   11 ++++
 rb_libtorrent-0.14.10-py27.patch    |   11 ----
 rb_libtorrent.spec                  |  102 ++++++++++++++++++++--------------
 sources                             |    2 +-
 5 files changed, 73 insertions(+), 56 deletions(-)
---
diff --cc rb_libtorrent.spec
index 64ea1a6,ae857ee..1424798
--- a/rb_libtorrent.spec
+++ b/rb_libtorrent.spec
@@@ -109,18 -120,20 +120,29 @@@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %
  ## XXX: Even with the --with-asio=system configure option, the stuff in
  ## the local include directory overrides that of the system. We don't like
  ## local copies of system code. :)
 +
 +## FIXME
 +## FIXME
 +## There are lots of warning about breaking aliasing rules, so
 +## for now compiling with -fno-strict-aliasing. Please check if
 +## newer version fixes this.
 +export CFLAGS="%{optflags} -fno-strict-aliasing"
 +export CXXFLAGS="%{optflags} -fno-strict-aliasing"
 +
  rm -rf include/libtorrent/asio*
- %configure --disable-static				\
+ 
+ 
+ %build
+ ## FIXME
+ ## FIXME
+ ## There are lots of warning about breaking aliasing rules, so
+ ## for now compiling with -fno-strict-aliasing. Please check if
+ ## newer version fixes this.
+ export CFLAGS="%{optflags} -fno-strict-aliasing"
+ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
+ 
+ %configure \
+ 	--disable-static				\
  	--enable-examples				\
  	--enable-python-binding				\
  	--with-asio=system				\