[python-websockify/el6: 2/2] Merge remote-tracking branch 'origin/el6' into el6

[Nikola Dipanov]

commit 50731e0e87796571e0991f08ffdae0894a9aaf64
Merge: 1604b81 d597cb6
Author: Nikola Dipanov <ndipanov at redhat.com>
Date:   Fri Nov 2 14:46:20 2012 +0100

    Merge remote-tracking branch 'origin/el6' into el6

 python-websockify.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc python-websockify.spec
index a4d426c,023c698..1bc7a6f
--- a/python-websockify.spec
+++ b/python-websockify.spec
@@@ -17,8 -16,10 +17,11 @@@ Python WSGI based adapter for the Webso
  %prep
  %setup -q -n websockify-%{version}
  %patch0 -p1
 +%patch1 -p1
  
+ # TODO: Have the following handle multi line entries
+ sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
+ 
  %build
  %{__python} setup.py build
  
@@@ -42,12 -43,9 +45,15 @@@ install -m 444 docs/websockify.1 %{buil
  
  
  %changelog
- * Mon Oct 22 2012 Nikola Đipanov <ndipanov at redhat.com> - 0.2.0-1
++* Fri Nov 2 2012 Nikola Đipanov <ndipanov at redhat.com> - 0.2.0-1
 +- Moving to the upstream version 0.2.0
 +
+ * Wed Oct 31 2012 Pádraig Brady <P at draigBrady.com> - 0.1.0-6
+ - Remove hard dependency on numpy
+ 
 +* Thu Jun 14 2012 Pádraig Brady <P at draigBrady.com> - 0.1.0-5
 +- Removed hard dependency on numpy
 +
  * Wed Jun 6 2012 Adam Young <ayoung at redhat.com> - 0.1.0-4
  - Added Description
  - Added Manpage