From 5f293c74c3f9dd5ee8dbd02c47838bd78db7f031 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: May 12 2016 09:57:48 +0000 Subject: Add python3 support --- diff --git a/.gitignore b/.gitignore index 6e88205..6ba4ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /Twisted-15.1.0.tar.bz2 /Twisted-15.2.1.tar.bz2 /Twisted-15.4.0.tar.bz2 +/Twisted-16.1.1.tar.bz2 diff --git a/python-twisted.spec b/python-twisted.spec index 5213b5f..e8218e2 100644 --- a/python-twisted.spec +++ b/python-twisted.spec @@ -1,16 +1,32 @@ Name: python-twisted -Version: 15.4.0 -Release: 3%{?dist} +Version: 16.1.1 +Release: 2%{?dist} Summary: Twisted is a networking engine written in Python License: MIT URL: http://twistedmatrix.com/ Source0: https://pypi.python.org/packages/source/T/Twisted/Twisted-%{version}.tar.bz2 BuildRequires: python2-devel >= 2.6 +BuildRequires: python3-devel >= 3.3 BuildRequires: python-zope-interface >= 3.6.0 +BuildRequires: python3-zope-interface >= 4.0.2 BuildRequires: python-crypto >= 2.6.1 +BuildRequires: python3-crypto >= 2.6.1 BuildRequires: pyOpenSSL >= 0.10 +BuildRequires: python3-pyOpenSSL >= 0.10 BuildRequires: python-service-identity +BuildRequires: python3-service-identity BuildRequires: python-setuptools +BuildRequires: python3-setuptools + +%description +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. + + +%package -n python2-twisted +Summary: %{summary} +%{?python_provide:%python_provide python2-twisted} Requires: python-zope-interface >= 3.6.0 Requires: pyOpenSSL >= 0.10 @@ -55,7 +71,30 @@ Requires: tkinter Requires: pyserial -%description +%description -n python2-twisted +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. + + +%package -n python3-twisted +Summary: %{summary} +Requires: python3-zope-interface +%{?python_provide:%python_provide python3-twisted} + +Requires: python3-zope-interface >= 3.6.0 +Requires: python3-pyOpenSSL >= 0.10 +Requires: python3-service-identity + +# python-twisted-conch +Requires: python3-crypto +Requires: python3-pyasn1 +Requires: python3-tkinter + +# python-twisted-core +Requires: python3-pyserial + +%description -n python3-twisted 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. @@ -65,38 +104,58 @@ and more. %setup -q -n Twisted-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build +%py3_build +%py2_build %install -rm -rf $RPM_BUILD_ROOT -%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%py3_install + +# Move and symlink python3 scripts +mv %{buildroot}%{_bindir}/trial %{buildroot}%{_bindir}/trial-%{python3_version} +ln -s ./trial-%{python3_version} %{buildroot}%{_bindir}/trial-3 + +mv %{buildroot}%{_bindir}/twistd %{buildroot}%{_bindir}/twistd-%{python3_version} +ln -s ./twistd-%{python3_version} %{buildroot}%{_bindir}/twistd-3 + + +# non-executable-script +%{__chmod} +x %{buildroot}%{python3_sitelib}/twisted/trial/test/scripttest.py + + +%py2_install # Packages that install arch-independent twisted plugins install here. # https://bugzilla.redhat.com/show_bug.cgi?id=1252140 %{__mkdir_p} %{buildroot}%{python2_sitelib}/twisted/plugins +%{__mkdir_p} %{buildroot}%{python3_sitelib}/twisted/plugins # no-manual-page-for-binary %{__mkdir_p} %{buildroot}%{_mandir}/man1/ for s in conch core mail; do -%{__cp} -a doc/$s/man/*.1 %{buildroot}%{_mandir}/man1/ +%{__cp} -a docs/$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 +%{__rm} -v %{buildroot}%{python3_sitelib}/twisted/runner/portmap.c +%{__rm} -v %{buildroot}%{python3_sitelib}/twisted/test/raiser.c +%{__rm} -v %{buildroot}%{python3_sitelib}/twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c +%{__rm} -v %{buildroot}%{python3_sitelib}/twisted/internet/iocpreactor/iocpsupport/winsock_pointers.h +%{__rm} -v %{buildroot}%{python3_sitelib}/twisted/internet/iocpreactor/iocpsupport/iocpsupport.c +%{__rm} -v %{buildroot}%{python3_sitelib}/twisted/python/_sendmsg.c + # pem-certificate # Needed for self-tests. # 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 @@ -105,18 +164,24 @@ done %{__chmod} 755 %{buildroot}%{python2_sitearch}/twisted/test/raiser.so +# Move and symlink python2 scripts +mv %{buildroot}%{_bindir}/trial %{buildroot}%{_bindir}/trial-%{python2_version} +ln -s ./trial-%{python2_version} %{buildroot}%{_bindir}/trial-2 +ln -s ./trial-%{python2_version} %{buildroot}%{_bindir}/trial + +mv %{buildroot}%{_bindir}/twistd %{buildroot}%{_bindir}/twistd-%{python2_version} +ln -s ./twistd-%{python2_version} %{buildroot}%{_bindir}/twistd-2 +ln -s ./twistd-%{python2_version} %{buildroot}%{_bindir}/twistd + %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 -%doc CONTRIBUTING LICENSE NEWS README +%files -n python2-twisted +%doc CONTRIBUTING NEWS README.rst +%license LICENSE %{_bindir}/cftp %{_bindir}/ckeygen %{_bindir}/conch @@ -128,6 +193,8 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/tkconch %{_bindir}/trial %{_bindir}/twistd +%{_bindir}/trial-2* +%{_bindir}/twistd-2* %{_mandir}/man1/cftp.1* %{_mandir}/man1/ckeygen.1* %{_mandir}/man1/conch.1* @@ -139,13 +206,32 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/tkconch.1* %{_mandir}/man1/trial.1* %{_mandir}/man1/twistd.1* -%{python2_sitearch}/twisted -%{python2_sitearch}/Twisted* -%{python2_sitelib}/twisted -%{python2_sitelib}/twisted/plugins +%{python2_sitearch}/* +%{python2_sitelib}/* + +%files -n python3-twisted +%doc CONTRIBUTING NEWS README.rst +%license LICENSE +%{_bindir}/trial-3* +%{_bindir}/twistd-3* +%{python3_sitelib}/* %changelog +* Tue May 10 2016 Petr Viktorin - 16.1.1-2 +- Update to better conform to Python packaging guidelines + +* Thu May 05 2016 Julien Enselme - 16.1.1-1 +- Update to 16.1.1 (#1287381) + +* Thu Mar 10 2016 Julien Enselme - 15.5.0-2 +- Add python3 support + +* Thu Mar 10 2016 Julien Enselme - 15.5.0-1 +- Update to 15.5.0 (#1287381) +- Use new python macros +- Remove deprecated %%clean section + * Thu Feb 04 2016 Fedora Release Engineering - 15.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 1a34fb2..9626616 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5337ffb6aeeff3790981a2cd56db9655 Twisted-15.4.0.tar.bz2 +266a085f5ce3fbc060818bd00bd6a888 Twisted-16.1.1.tar.bz2