diff --git python-moksha-hub/python-moksha-hub.spec python-moksha-hub/python-moksha-hub.spec.tmp index 905c14f8c4..5ded9bc7a7 100644 --- python-moksha-hub/python-moksha-hub.spec +++ python-moksha-hub/python-moksha-hub.spec.tmp @@ -6,7 +6,7 @@ Name: python-moksha-hub Version: 1.5.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Hub components for Moksha License: ASL 2.0 @@ -51,6 +51,20 @@ BuildRequires: python3-daemon BuildRequires: python3-websocket-client %endif +# When installed, these enable new plugins for the moksha.hub +#BuildRequires: python-qpid +#Requires: python-qpid + +# Its a whole different package now. + +%global _description\ +Hub components for Moksha.\ + + +%description %_description + +%package -n python2-moksha-hub +Summary: %summary Requires: python-moksha-common >= 1.0.6 Requires: python2-twisted Requires: python2-stomper @@ -58,17 +72,10 @@ Requires: python-txzmq Requires: python-txws Requires: python-daemon Requires: python-six - -# When installed, these enable new plugins for the moksha.hub -#BuildRequires: python-qpid -#Requires: python-qpid - -# Its a whole different package now. Conflicts: moksha < 1.0.0 +%{?python_provide:%python_provide python2-moksha-hub} -%description -Hub components for Moksha. - +%description -n python2-moksha-hub %_description %if 0%{?with_python3} %package -n python3-moksha-hub @@ -135,7 +142,7 @@ ln -s ./moksha-hub-2 %{buildroot}%{_bindir}/moksha-hub %{__python3} setup.py test %endif -%files +%files -n python2-moksha-hub %doc README AUTHORS %license COPYING %{python2_sitelib}/moksha/hub/ @@ -155,6 +162,10 @@ ln -s ./moksha-hub-2 %{buildroot}%{_bindir}/moksha-hub %endif %changelog +* Sat Aug 12 2017 Zbigniew Jędrzejewski-Szmek - 1.5.3-5 +- Python 2 binary package renamed to python2-moksha-hub + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + * Mon Jul 31 2017 Lumír Balhar - 1.5.3-4 - Python 3 subpackage enabled - Specfile modernized and improved