[python-twisted] Update to 14.0.0, retire python-twisted-* and provide twisted in one package.
Jonathan Steffan
jsteffan at fedoraproject.org
Sun Jun 8 04:42:06 UTC 2014
commit 7ef050a57229891991d13dfadfef6fd2b4ef6c87
Author: Jonathan Steffan <jsteffan at fedoraproject.org>
Date: Sat Jun 7 22:41:56 2014 -0600
Update to 14.0.0, retire python-twisted-* and provide twisted in one package.
.gitignore | 1 +
PKG-INFO | 14 --
README.fedora | 5 +-
python-twisted-14.0.0-doc-lore-man-fix.patch | 14 ++
python-twisted.spec | 176 +++++++++++++++++++++-----
sources | 1 +
6 files changed, 160 insertions(+), 51 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..84e9147 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/Twisted-14.0.0.tar.bz2
diff --git a/README.fedora b/README.fedora
index 23c96a9..f544f72 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,2 +1,3 @@
-This package is an umbrella package to pull in all separate Twisted
-projects.
+As of 14.0.0, twisted has been combined back into one package.
+The python-twisted-* packages will be retired with their functionality
+provided by the main python-twisted package.
diff --git a/python-twisted-14.0.0-doc-lore-man-fix.patch b/python-twisted-14.0.0-doc-lore-man-fix.patch
new file mode 100644
index 0000000..3242ca8
--- /dev/null
+++ b/python-twisted-14.0.0-doc-lore-man-fix.patch
@@ -0,0 +1,14 @@
+diff -up Twisted-14.0.0/doc/lore/man/lore.1.orig Twisted-14.0.0/doc/lore/man/lore.1
+--- Twisted-14.0.0/doc/lore/man/lore.1.orig 2014-06-07 22:20:59.400731476 -0600
++++ Twisted-14.0.0/doc/lore/man/lore.1 2014-06-07 22:21:30.121599388 -0600
+@@ -55,8 +55,8 @@ Display version information and exit.
+ .TP
+ \fI--config\fR
+ Add input/output-specific information.
+-HTML output allows for 'ext=<extension>',
+-'template=<template>' and 'baseurl=<format string for API URLs>'. LaTeX
++HTML output allows for 'ext=<extension>', 'template=<template>'
++and 'baseurl=<format string for API URLs>'. LaTeX
+ output allows for 'section' or 'chapter' in Lore, and nothing in Math-Lore.
+ Lore output allows for 'ext=<extension>'. Lint output allows nothing.
+ Note that disallowed \fI--config\fR options are merely ignored, and do
diff --git a/python-twisted.spec b/python-twisted.spec
index 20e4245..20f18bc 100644
--- a/python-twisted.spec
+++ b/python-twisted.spec
@@ -1,57 +1,163 @@
-%{!?python:%define python python}
-
-Name: %{python}-twisted
-Version: 12.2.0
-Release: 4%{?dist}
-Summary: Event-based framework for internet applications
+Name: python-twisted
+Version: 14.0.0
+Release: 1%{?dist}
+Summary: Twisted is a networking engine written in Python
License: MIT
URL: http://twistedmatrix.com/
-Source0: README.fedora
-#Obtained by running python setup.py egg_info in the unitary tarball
-Source1: PKG-INFO
-BuildArch: noarch
-BuildRequires: python
-Requires: python
-Requires: %{python}-twisted-core >= %{version}
-Requires: %{python}-twisted-conch >= %{version}
-Requires: %{python}-twisted-lore >= %{version}
-Requires: %{python}-twisted-mail >= %{version}
-Requires: %{python}-twisted-names >= %{version}
-Requires: %{python}-twisted-news >= %{version}
-Requires: %{python}-twisted-runner >= %{version}
-Requires: %{python}-twisted-web >= %{version}
-Requires: %{python}-twisted-words >= %{version}
+Source0: http://twistedmatrix.com/Releases/Twisted/14.0/Twisted-14.0.0.tar.bz2
+Patch0: python-twisted-14.0.0-doc-lore-man-fix.patch
+BuildRequires: python2-devel >= 2.6
+BuildRequires: python-zope-interface >= 3.6.0
+BuildRequires: python-crypto >= 2.6.1
+BuildRequires: pyOpenSSL >= 0.10
+
+Requires: python-zope-interface >= 3.6.0
+Requires: pyOpenSSL >= 0.10
+
+# Bring all provided resources back into the main package namespace.
+Obsoletes: python-twisted-conch < 14
+Provides: python-twisted-conch = %{version}-%{release}
+Obsoletes: python-twisted-core < 14
+Provides: python-twisted-core = %{version}-%{release}
+Obsoletes: python-twisted-lore < 14
+Provides: python-twisted-lore = %{version}-%{release}
+Obsoletes: python-twisted-mail < 14
+Provides: python-twisted-mail = %{version}-%{release}
+Obsoletes: python-twisted-names < 14
+Provides: python-twisted-names = %{version}-%{release}
+Obsoletes: python-twisted-news < 14
+Provides: python-twisted-news = %{version}-%{release}
+Obsoletes: python-twisted-runner < 14
+Provides: python-twisted-runner = %{version}-%{release}
+Obsoletes: python-twisted-web < 14
+Provides: python-twisted-web = %{version}-%{release}
+Obsoletes: python-twisted-web2 < 14
+Provides: python-twisted-web2 = %{version}-%{release}
+Obsoletes: python-twisted-words < 14
+Provides: python-twisted-words = %{version}-%{release}
+
+# Capture previous namespace.
Obsoletes: Twisted < 2.4.0-1
Provides: Twisted = %{version}-%{release}
Obsoletes: twisted < 2.4.0-1
Provides: twisted = %{version}-%{release}
+# python-twisted-conch
+Requires: python-crypto
+Requires: python-pyasn1
+Requires: tkinter
+
+# python-twisted-core
+Requires: pyserial
+
+
%description
-Twisted is an event-based framework for internet applications. It includes a
-web server, a telnet server, a chat server, a news server, a generic client
-and server for remote object access, and APIs for creating new protocols and
-services. Twisted supports integration of the Tk, GTK+, Qt or wxPython event
-loop with its main event loop. The Win32 event loop is also supported, as is
-basic support for running servers on top of Jython.
+Twisted is a networking engine written in Python, supporting numerous protocols.
+It contains a web server, numerous chat clients, chat servers, mail servers
+and more.
-Installing this package brings all Twisted sub-packages into your system.
%prep
-%setup -c -T
-install -p -m 0644 %{SOURCE0} README
+%setup -q -n Twisted-%{version}
+%patch0 -p1
-%install
-install -d $RPM_BUILD_ROOT%{python_sitelib}
-install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{python_sitelib}/Twisted-%{version}-py2.7.egg-info
+%build
+CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build
-%files
-%doc README
-%{python_sitelib}/Twisted-%{version}-py2.7.egg-info
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+# egg-info
+if [ -f %{buildroot}%{python2_sitearch}/Twisted*.egg-info ]; then
+ echo %{buildroot}%{python2_sitearch}/Twisted*.egg-info |
+ sed -e "s|^%{buildroot}||"
+fi > egg-info
+
+# no-manual-page-for-binary
+%{__mkdir_p} %{buildroot}%{_mandir}/man1/
+for s in conch core lore mail; do
+%{__cp} -a doc/$s/man/*.1 %{buildroot}%{_mandir}/man1/
+done
+
+# devel-file-in-non-devel-package
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/runner/portmap.c
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/python/_initgroups.c
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/test/raiser.c
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/iocpreactor/iocpsupport/winsock_pointers.h
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/iocpreactor/iocpsupport/iocpsupport.c
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/python/sendmsg.c
+
+# pem-certificate
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/test/fake_CAs/thing1.pem
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/mail/test/server.pem
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/test/server.pem
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/test/fake_CAs/chain.pem
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/test/fake_CAs/thing2.pem
+%{__rm} -v %{buildroot}%{python2_sitearch}/twisted/internet/test/fake_CAs/thing2-duplicate.pem
+
+# non-executable-script
+%{__chmod} +x %{buildroot}%{python2_sitearch}/twisted/mail/test/pop3testserver.py
+%{__chmod} +x %{buildroot}%{python2_sitearch}/twisted/python/test/pullpipe.py
+%{__chmod} +x %{buildroot}%{python2_sitearch}/twisted/trial/test/scripttest.py
+
+# non-standard-executable-perm
+%{__chmod} 755 %{buildroot}%{python2_sitearch}/twisted/python/sendmsg.so
+%{__chmod} 755 %{buildroot}%{python2_sitearch}/twisted/runner/portmap.so
+%{__chmod} 755 %{buildroot}%{python2_sitearch}/twisted/test/raiser.so
+
+
+%check
+# bin/trial twisted
+# can't get this to work within the buildroot yet due to multicast
+# https://twistedmatrix.com/trac/ticket/7494
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f egg-info
+%doc CONTRIBUTING LICENSE NEWS README
+%{_bindir}/cftp
+%{_bindir}/ckeygen
+%{_bindir}/conch
+%{_bindir}/lore
+%{_bindir}/mailmail
+%{_bindir}/manhole
+%{_bindir}/pyhtmlizer
+%{_bindir}/tap2deb
+%{_bindir}/tap2rpm
+%{_bindir}/tapconvert
+%{_bindir}/tkconch
+%{_bindir}/trial
+%{_bindir}/twistd
+%{_mandir}/man1/cftp.1*
+%{_mandir}/man1/ckeygen.1*
+%{_mandir}/man1/conch.1*
+%{_mandir}/man1/lore.1*
+%{_mandir}/man1/mailmail.1*
+%{_mandir}/man1/manhole.1*
+%{_mandir}/man1/pyhtmlizer.1*
+%{_mandir}/man1/tap2deb.1*
+%{_mandir}/man1/tap2rpm.1*
+%{_mandir}/man1/tapconvert.1*
+%{_mandir}/man1/tkconch.1*
+%{_mandir}/man1/trial.1*
+%{_mandir}/man1/twistd.1*
+%{python2_sitearch}/twisted
%changelog
+* Sat Jun 07 2014 Jonathan Steffan <jsteffan at fedoraproject.org> - 14.0.0-1
+- Update to 14.0.0
+- Ship Twisted as a fully featured package without subpackages on the advice
+ of upstream and to mirror what pypi provides
+- Explictly build for python2 with new macros
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 12.2.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index e69de29..c8d76dc 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+9625c094e0a18da77faa4627b98c9815 Twisted-14.0.0.tar.bz2
More information about the scm-commits
mailing list