diff --git a/python-twisted.spec b/python-twisted.spec index 3b3ed47..8129bc9 100644 --- a/python-twisted.spec +++ b/python-twisted.spec @@ -10,6 +10,7 @@ License: MIT URL: http://twistedmatrix.com/ Source0: https://twistedmatrix.com/Releases/Twisted/16.2/Twisted-%{version}.tar.bz2 + %description Twisted is a networking engine written in Python, supporting numerous protocols. It contains a web server, numerous chat clients, chat servers, mail servers @@ -39,7 +40,7 @@ Provides: python-twisted-core = %{version}-%{release} Obsoletes: python-twisted-core-doc < 14 Provides: python-twisted-core-doc = %{version}-%{release} Obsoletes: python-twisted-lore < 14 -# Lore has been removed +# obsolete-not-provided: Lore has been removed completely upstream Obsoletes: python-twisted-mail < 14 Provides: python-twisted-mail = %{version}-%{release} Obsoletes: python-twisted-names < 14 @@ -99,6 +100,7 @@ Requires: python3-pyasn1 # 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 @@ -109,6 +111,7 @@ and more. %prep %setup -q -n Twisted-%{version} + %build %if 0%{?with_python3} %py3_build @@ -121,6 +124,7 @@ and more. %py3_install # Move and symlink python3 scripts +# no-manual-page-for-binary: man page is trial and twistd mv %{buildroot}%{_bindir}/trial %{buildroot}%{_bindir}/trial-%{python3_version} ln -s ./trial-%{python3_version} %{buildroot}%{_bindir}/trial-3 @@ -169,17 +173,15 @@ done # non-executable-script %{__chmod} +x %{buildroot}%{python2_sitearch}/twisted/mail/test/pop3testserver.py -%if 0%{?with_python3} %{__chmod} +x %{buildroot}%{python2_sitearch}/twisted/trial/test/scripttest.py -%endif # 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 - # Move and symlink python2 scripts +# no-manual-page-for-binary: man page is trial and twistd 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 @@ -188,6 +190,7 @@ 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