From 808356bb575ad54bd682c66d2904d72b15946c96 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Oct 11 2018 07:43:49 +0000 Subject: Python2 binary package has been removed --- diff --git a/python-XStatic-termjs.spec b/python-XStatic-termjs.spec index 26249e7..c4e22f5 100644 --- a/python-XStatic-termjs.spec +++ b/python-XStatic-termjs.spec @@ -1,13 +1,9 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global pypi_name XStatic-term.js %global pkgname XStatic-termjs Name: python-%{pkgname} Version: 0.0.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: term.js (XStatic packaging standard) License: MIT @@ -23,28 +19,6 @@ This package is intended to be used by any project that needs these files. It intentionally does not provide any extra code except some metadata nor has any extra requirements. -%package -n python2-%{pkgname} -Summary: %{summary} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -Requires: python2-XStatic -Requires: xstatic-termjs-common - -%{?python_provide:%python_provide python2-%{pkgname}} - -%description -n python2-%{pkgname} -JavaScript library packaged for setuptools (easy_install) / pip. - -This package is intended to be used by any project that needs these files. - -It intentionally does not provide any extra code except some metadata -nor has any extra requirements. - -This package provides Python 2 build of %{pkgname}. - -%if 0%{?with_python3} %package -n python3-%{pkgname} Summary: %{summary} @@ -65,7 +39,6 @@ It intentionally does not provide any extra code except some metadata nor has any extra requirements. This package provides Python 3 build of %{pkgname}. -%endif %package -n xstatic-termjs-common Summary: %{summary} @@ -89,44 +62,31 @@ This package contains the javascript files. sed -i "s|^BASE_DIR = .*|BASE_DIR = '%{_jsdir}/termjs'|" xstatic/pkg/termjs/__init__.py %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif %install -%py2_install +%py3_install mkdir -p %{buildroot}%{_jsdir}/termjs -mv %{buildroot}%{python2_sitelib}/xstatic/pkg/termjs/data/term.js %{buildroot}%{_jsdir}/termjs -rmdir %{buildroot}%{python2_sitelib}/xstatic/pkg/termjs/data/ +mv %{buildroot}%{python3_sitelib}/xstatic/pkg/termjs/data/term.js %{buildroot}%{_jsdir}/termjs +rmdir %{buildroot}%{python3_sitelib}/xstatic/pkg/termjs/data/ # fix execute flags for js chmod 644 %{buildroot}%{_jsdir}/termjs/term.js -%if 0%{?with_python3} -%py3_install -# Remove static files, already created by the python2 subpkg -rm -rf %{buildroot}%{python3_sitelib}/xstatic/pkg/termjs/data -%endif - -%files -n python2-%{pkgname} -%doc README.rst -%{python2_sitelib}/xstatic/pkg/termjs -%{python2_sitelib}/XStatic_term.js-%{version}-py%{python2_version}.egg-info -%{python2_sitelib}/XStatic_term.js-%{version}-py%{python2_version}-nspkg.pth - -%if 0%{?with_python3} %files -n python3-%{pkgname} %doc README.rst %{python3_sitelib}/xstatic/pkg/termjs %{python3_sitelib}/XStatic_term.js-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/XStatic_term.js-%{version}-py%{python3_version}-nspkg.pth -%endif %files -n xstatic-termjs-common %doc README.rst %{_jsdir}/termjs %changelog +* Thu Oct 11 2018 Miro Hrončok - 0.0.7.0-5 +- Python2 binary package has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Fri Jul 13 2018 Fedora Release Engineering - 0.0.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild