[python-txws/f17: 3/3] Merge branch 'master' into el6

[Ralph Bean]

commit ff7858802121ee4d588f69c03bd860d5d1f3e44e
Merge: 4910e82 6c53c9c
Author: Ralph Bean <rbean at redhat.com>
Date:   Tue May 29 22:57:22 2012 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	python-txws.spec

 python-txws.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc python-txws.spec
index d3328c7,b84cceb..8ab9461
--- a/python-txws.spec
+++ b/python-txws.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:             python-txws
  Version:          0.7
--Release:          4%{?dist}
++Release:          5%{?dist}
  Summary:          Twisted WebSockets wrapper
  
  Group:            Development/Languages
@@@ -24,8 -24,11 +24,9 @@@ for adding WebSockets server support t
  
  %prep
  %setup -q -n txWS-%{version}
+ 
 -# Patch out the setuptools requirement on Twisted since epel doesn't ship
 -# twisted egg-info
 -%if %{?rhel}%{!?rhel:0} >= 6
 -%{__sed} -i 's/"Twisted",//' setup.py
 +%if 0%{?rhel}
 +%{__sed} -i -e 's/"Twisted",//' setup.py
  %endif
  
  %build
@@@ -46,9 -49,8 +47,12 @@@
  %{python_sitelib}/* 
  
  %changelog
 -* Tue May 29 2012 Ralph Bean <rbean at redhat.com> 0.7-4
 -- Patch out setuptools dep on Twisted for epel.
++* Tue May 29 2012 Ralph Bean <rbean at redhat.com> 0.7-5
++- Resolve merge conflict between rawhide and el6.
++
 +* Mon May 21 2012 Luke Macken <lmacken at redhat.com> 0.7-4
 +- Remove the Twisted dependency from the setup.py, since the RHEL package does
 +  not contain the necessary egg-info metadata.
  
  * Mon Apr 09 2012 Ralph Bean <rbean at redhat.com> 0.7-3
  - Removed defattr in %files section.