rpms/python-twisted-core/devel python-twisted-core.spec,1.7,1.8

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/rpms/python-twisted-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30658

Modified Files:
	python-twisted-core.spec 
Log Message:
* 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



Index: python-twisted-core.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-twisted-core/devel/python-twisted-core.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-twisted-core.spec	20 Feb 2008 05:06:00 -0000	1.7
+++ python-twisted-core.spec	7 Mar 2008 16:58:21 -0000	1.8
@@ -1,12 +1,11 @@
 %{?!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.5.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        An asynchronous networking framework written in Python
 
 Group:          Development/Libraries
@@ -22,11 +21,6 @@
 BuildRequires:  /bin/sed
 BuildRequires:  /bin/awk
 
-# for FC3 and earlier
-%if "%{pybasever}" < "2.4"
-Requires:       python(abi) = %{pybasever}
-%endif
-
 Requires:       %{python}-zope-interface
 Requires:       pyOpenSSL
 
@@ -132,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*
@@ -180,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/*
@@ -190,6 +184,9 @@
 %{_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