rpms/python-twisted-core/EL-5 python-twisted-core.spec, 1.3, 1.4 sources, 1.2, 1.3

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/python-twisted-core/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3593

Modified Files:
	python-twisted-core.spec sources 
Log Message:
Merge from devel (#454918)


Index: python-twisted-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-twisted-core/EL-5/python-twisted-core.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- python-twisted-core.spec	26 Dec 2006 15:00:12 -0000	1.3
+++ python-twisted-core.spec	26 Oct 2008 20:19:30 -0000	1.4
@@ -1,28 +1,25 @@
 %{?!python:%define python python}
-%{?!pybasever:%{expand:%%define pybasever %(%{__python} -c "import sys ; print sys.version[:3]")}}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %define origname TwistedCore
 
 Name:           %{python}-twisted-core
-Version:        2.4.0
-Release:        6%{?dist}
+Version:        2.5.0
+Release:        4%{?dist}
 Summary:        An asynchronous networking framework written in Python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://twistedmatrix.com/trac/wiki/TwistedCore
-Source0:        http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/%{origname}-%{version}.tar.bz2
+Source0:        http://tmrc.mit.edu/mirror/twisted/Twisted/2.5/%{origname}-%{version}.tar.bz2
 Source1:        twisted-dropin-cache
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{python}-devel
 BuildRequires:  %{python}-zope-interface
 
-# for FC3 and earlier
-%if "%{pybasever}" < "2.4"
-Requires:       python(abi) = %{pybasever}
-%endif
+BuildRequires:  /bin/sed
+BuildRequires:  /bin/awk
 
 Requires:       %{python}-zope-interface
 Requires:       pyOpenSSL
@@ -95,7 +92,7 @@
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}
 
 rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/protocols/_c_urlarg.c
-rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/spread/cBanana.c
+rm $RPM_BUILD_ROOT%{python_sitearch}/twisted/python/_epoll.c
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,7 +107,6 @@
 %{_bindir}/tap2deb
 %{_bindir}/tap2rpm
 %{_bindir}/tapconvert
-%{_bindir}/tkmktap
 %{_bindir}/trial
 %{_bindir}/twistd
 %{_libexecdir}/twisted-dropin-cache
@@ -130,12 +126,8 @@
 %{python_sitearch}/twisted/manhole/*.glade
 
 %{python_sitearch}/twisted/manhole/ui/
-%{python_sitearch}/twisted/manhole/ui/*.py*
-%{python_sitearch}/twisted/manhole/ui/*.glade
-%{python_sitearch}/twisted/manhole/ui/gtkrc
 
 %{python_sitearch}/twisted/persisted/
-%{python_sitearch}/twisted/persisted/journal/
 
 %dir %{python_sitearch}/twisted/plugins/
 %{python_sitearch}/twisted/plugins/*.py*
@@ -150,6 +142,7 @@
 
 %dir %{python_sitearch}/twisted/python/
 %{python_sitearch}/twisted/python/*.py*
+%{python_sitearch}/twisted/python/*.so
 
 %dir %{python_sitearch}/twisted/python/zsh/
 %{python_sitearch}/twisted/python/zsh/README
@@ -159,7 +152,6 @@
 
 %dir %{python_sitearch}/twisted/spread/
 %{python_sitearch}/twisted/spread/*.py*
-%{python_sitearch}/twisted/spread/*.so
 
 %dir %{python_sitearch}/twisted/spread/ui/
 %{python_sitearch}/twisted/spread/ui/*.py*
@@ -178,6 +170,10 @@
 %{python_sitearch}/twisted/trial/test/*.py*
 %{python_sitearch}/twisted/trial/test/notpython
 
+%if 0%{?fedora} >= 9
+  %{python_sitearch}/Twisted-%{version}-py2.5.egg-info
+%endif
+
 %files doc
 %defattr(-,root,root,-)
 %doc doc/*
@@ -188,6 +184,22 @@
 %{_datadir}/zsh/site-functions/_twisted_zsh_stub
 
 %changelog
+* Fri Mar 07 2008 Jesse Keating <jkeating at redhat.com> - 2.5.0-4
+- Handle egg, drop pyver stuff, attempt to fix the multiple file listings
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.5.0-3
+- Autorebuild for GCC 4.3
+
+* Fri Aug 31 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.5.0-2
+- add sed and awk as buildrequires
+
+* Thu Aug 23 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.5.0-1
+- updated to newest version
+- remove twisted/spread/*.so
+- added epoll.so
+
 * Tue Dec 26 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 2.4.0-6
 - new twisted-dropin-cache; does not complain loudly about plugins in


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-twisted-core/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Nov 2006 12:05:21 -0000	1.2
+++ sources	26 Oct 2008 20:19:30 -0000	1.3
@@ -1 +1 @@
-042a57f65fe919a9234047d7ce8c43f1  TwistedCore-2.4.0.tar.bz2
+cf8d8d73c3b58b79c6a16b5fc23d5b61  TwistedCore-2.5.0.tar.bz2