diff --git a/python-simplevisor.spec b/python-simplevisor.spec index 6b1b0ce..64cc2a6 100644 --- a/python-simplevisor.spec +++ b/python-simplevisor.spec @@ -1,32 +1,19 @@ -%if 0%{?fedora} > 12 || 0%{?rhel} > 7 -%global with_python3 1 -%endif %global srcname simplevisor Name: python-simplevisor Version: 1.2 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Python simple daemons supervisor License: ASL 2.0 URL: https://github.com/cern-mig/%{name} Source0: https://pypi.python.org/packages/ef/a1/d3fef46a01312d8cb470503a476f813bd31abbc2136be37eb9fd1f537b73/%{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -%if 0%{?with_python3} BuildRequires: python3-devel -%endif # if with_python3 %if 0%{?fedora} >= 24 BuildRequires: perl-generators %endif BuildRequires: perl-No-Worries -%if ! 0%{?with_python3} -BuildRequires: python-argparse -%endif -# For python < 2.6 python-siplejson is required -%if 0%{?rhel} && 0%{?rhel} <= 6 -BuildRequires: python-simplejson -%endif %global _description\ Simplevisor is a simple daemons supervisor, it is inspired by\ @@ -34,102 +21,48 @@ Erlang OTP and it can supervise hierarchies of services. %description %_description -%package -n python2-simplevisor -Summary: %summary -Provides: python2-simplevisor -Requires: perl-Config-General -Requires: perl-No-Worries -%if ! 0%{?with_python3} -Requires: python-argparse -%endif -%if 0%{?rhel} && 0%{?rhel} <= 6 -Requires: python-simplejson -%endif -%{?python_provide:%python_provide python2-simplevisor} - -%description -n python2-simplevisor %_description - -%if 0%{?with_python3} %package -n python3-simplevisor Summary: Python simple daemons supervisor %description -n python3-simplevisor Simplevisor is a simple daemons supervisor, it is inspired by Erlang OTP and it can supervise hierarchies of services. -%endif # with_python3 %prep %setup -q -n %{srcname}-%{version} -%if 0%{?with_python3} -rm -fr %{py3dir} -cp -a . %{py3dir} -find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' -%endif # with_python3 +find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|' %build -%{__python2} setup.py build -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py build -popd -%endif # with_python3 %install rm -fr $RPM_BUILD_ROOT -%{__python2} setup.py install --with-data-files --skip-build --root $RPM_BUILD_ROOT +%{__python3} setup.py install --with-data-files --skip-build --root $RPM_BUILD_ROOT install -D -m 644 man/%{srcname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}.1; install -D -m 644 man/%{srcname}-control.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}-control.1; install -D -m 644 man/%{srcname}-loop.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}-loop.1; -%if 0%{?with_python3} -mv $RPM_BUILD_ROOT/usr/bin/simplevisor $RPM_BUILD_ROOT/usr/bin/simplevisor2 -pushd %{py3dir} -%{__python3} setup.py install --with-data-files --skip-build --root $RPM_BUILD_ROOT -mv $RPM_BUILD_ROOT/usr/bin/simplevisor $RPM_BUILD_ROOT/usr/bin/simplevisor3 -cp $RPM_BUILD_ROOT/usr/bin/simplevisor-control $RPM_BUILD_ROOT/usr/bin/simplevisor3-control -cp $RPM_BUILD_ROOT/usr/bin/simplevisor-loop $RPM_BUILD_ROOT/usr/bin/simplevisor3-loop -install -D -m 644 man/%{srcname}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}3.1; -install -D -m 644 man/%{srcname}-control.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}3-control.1; -install -D -m 644 man/%{srcname}-loop.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{srcname}3-loop.1; -popd -mv $RPM_BUILD_ROOT/usr/bin/simplevisor2 $RPM_BUILD_ROOT/usr/bin/simplevisor -%endif # with_python3 %check -%{__python2} setup.py test -# And remove compiled documentation. -rm -f test/*.pyc -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py test +# And remove compiled documentation. rm -f test/*.pyc -popd -%endif # with_python3 -%files -n python2-simplevisor -%doc LICENSE README.rst CHANGES examples +%files -n python3-simplevisor +%doc LICENSE README.rst CHANGES %{_mandir}/man?/%{srcname}.1* %{_mandir}/man?/%{srcname}-control.1* %{_mandir}/man?/%{srcname}-loop.1* %attr(755, root, root) /usr/bin/simplevisor %attr(755, root, root) /usr/bin/simplevisor-control %attr(755, root, root) /usr/bin/simplevisor-loop -%{python2_sitelib}/%{srcname}/ -%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info - -%if 0%{?with_python3} -%files -n python3-simplevisor -%doc LICENSE README.rst CHANGES -%{_mandir}/man?/%{srcname}3.1* -%{_mandir}/man?/%{srcname}3-control.1* -%{_mandir}/man?/%{srcname}3-loop.1* -%attr(755, root, root) /usr/bin/simplevisor3 -%attr(755, root, root) /usr/bin/simplevisor3-control -%attr(755, root, root) /usr/bin/simplevisor3-loop %{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info %{python3_sitelib}/%{srcname}/ -%endif # with_python3 %changelog +* Mon Aug 26 2019 Lionel Cons - 1.2-16 +- Subpackage python2-simplevisor has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Mon Aug 19 2019 Miro HronĨok - 1.2-15 - Rebuilt for Python 3.8