diff --git a/python-XStatic-Bootstrap-SCSS.spec b/python-XStatic-Bootstrap-SCSS.spec index 23348a5..d3f5613 100644 --- a/python-XStatic-Bootstrap-SCSS.spec +++ b/python-XStatic-Bootstrap-SCSS.spec @@ -1,12 +1,8 @@ -%if 0%{?fedora} -%global with_python3 1 -%endif - %global pypi_name XStatic-Bootstrap-SCSS Name: python-%{pypi_name} Version: 3.3.7.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Bootstrap-SCSS (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-%{pypi_name} -Summary: %{summary} - -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -Requires: python2-XStatic -Requires: xstatic-bootstrap-scss-common - -%{?python_provide:%python_provide python2-%{pypi_name}} - -%description -n python2-%{pypi_name} -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 %{pypi_name}. - -%if 0%{?with_python3} %package -n python3-%{pypi_name} 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 %{pypi_name}. -%endif %package -n xstatic-bootstrap-scss-common Summary: %{summary} @@ -92,39 +65,23 @@ sed -i "s|^BASE_DIR = .*|BASE_DIR = '%{_jsdir}/bootstrap_scss'|" xstatic/pkg/boo cp %{SOURCE1} . %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif %install -%py2_install +%py3_install + mkdir -p %{buildroot}%{_jsdir}/bootstrap_scss -mv %{buildroot}%{python2_sitelib}/xstatic/pkg/bootstrap_scss/data/* %{buildroot}%{_jsdir}/bootstrap_scss -rmdir %{buildroot}%{python2_sitelib}/xstatic/pkg/bootstrap_scss/data/ +mv %{buildroot}%{python3_sitelib}/xstatic/pkg/bootstrap_scss/data/* %{buildroot}%{_jsdir}/bootstrap_scss +rmdir %{buildroot}%{python3_sitelib}/xstatic/pkg/bootstrap_scss/data/ # fix execute flags for js chmod 644 %{buildroot}%{_jsdir}/bootstrap_scss/js/*.js chmod 644 %{buildroot}%{_jsdir}/bootstrap_scss/js/bootstrap/*.js -%if 0%{?with_python3} -%py3_install -# Remove static files, already created by the python2 subpkg -rm -rf %{buildroot}%{python3_sitelib}/xstatic/pkg/bootstrap_scss/data -%endif - -%files -n python2-%{pypi_name} -%doc README.txt -%{python2_sitelib}/xstatic/pkg/bootstrap_scss -%{python2_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py%{python2_version}.egg-info -%{python2_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py%{python2_version}-nspkg.pth - -%if 0%{?with_python3} %files -n python3-%{pypi_name} %doc README.txt %{python3_sitelib}/xstatic/pkg/bootstrap_scss %{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py%{python3_version}.egg-info %{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py%{python3_version}-nspkg.pth -%endif %files -n xstatic-bootstrap-scss-common %doc README.txt @@ -132,6 +89,10 @@ rm -rf %{buildroot}%{python3_sitelib}/xstatic/pkg/bootstrap_scss/data %{_jsdir}/bootstrap_scss %changelog +* Wed Oct 17 2018 Zbigniew Jędrzejewski-Szmek - 3.3.7.1-6 +- Subpackage python2-XStatic-Bootstrap-SCSS has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Fri Jul 13 2018 Fedora Release Engineering - 3.3.7.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild