openstack
/
rpm-packaging
Code Issues Proposed changes

Convert remaining XStatic packages to py3, remove angular-ui-router 

XStatic-angular-ui-router was removed (see [1]). Plus, convert the
remaining XStatic packages to python3.

[1] - 217ec2eeb3

Change-Id: Idb7c54a586c886bfab9dadf0e4e208b432eebf00
This commit is contained in:
Javier Pena 2020-01-09 15:50:59 +01:00
parent 7b862ad311
commit 57ac9754df
4 changed files with 33 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
openstack/XStatic-QUnit/XStatic-QUnit.spec.j2
View File

@ -1,34 +1,37 @@
%global sname XStatic-QUnit
Name: {{ py2name('XStatic-QUnit') }}
Version: 1.14.0.2
Release: 0
{% set pypi_name = 'XStatic-QUnit' %}
{% set upstream_version = upstream_version('1.14.0.2') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
Name: {{ py2name(py_versions='py3') }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: QUnit %{version} (XStatic packaging standard)
License: {{ license('MIT') }}
Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-qunit/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
URL: https://opendev.org/openstack/xstatic-qunit/
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildRequires: {{ py3('setuptools') }}
Requires: {{ py3('XStatic') }}
BuildArch: noarch
%description
QUnit JavaScript library packaged for setuptools (easy_install) / pip.
%prep
%autosetup -n %{sname}-%{version}
%autosetup -n {{ pypi_name }}-{{ upstream_version }}
%py_req_cleanup
%build
%{py2_build}
%{py3_build}
%install
%{py2_install}
%{py3_install}
%files
%doc README.txt
%{python2_sitelib}/xstatic
%{python2_sitelib}/XStatic_QUnit-%{version}-py?.?.egg-info
%{python2_sitelib}/XStatic_QUnit-%{version}-py?.?-nspkg.pth
%{python3_sitelib}/xstatic
%{python3_sitelib}/XStatic_QUnit-*
%changelog

18
openstack/XStatic-Spin/XStatic-Spin.spec.j2
View File

@ -3,7 +3,7 @@
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
Name: {{ py2name() }}
Name: {{ py2name(py_versions='py3') }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: Spin %{version} (XStatic packaging standard)
@ -12,10 +12,9 @@ Group: Development/Languages/Python
URL: https://opendev.org/openstack/xstatic-spin/
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }}
Requires: {{ py2pkg('XStatic') }}
BuildRequires: {{ py3('setuptools') }}
Requires: {{ py3('XStatic') }}
BuildArch: noarch
%python_subpackages
%description
Spin JavaScript library packaged for setuptools (easy_install) / pip.
@ -25,15 +24,14 @@ Spin JavaScript library packaged for setuptools (easy_install) / pip.
%py_req_cleanup
%build
%{python_build}
%{py3_build}
%install
%{python_install}
%{py3_install}
%files %{python_files}
%files
%doc README.txt
%{python_sitelib}/xstatic
%{python_sitelib}/XStatic_Spin-%{version}-py?.?.egg-info
%{python_sitelib}/XStatic_Spin-%{version}-py?.?-nspkg.pth
%{python3_sitelib}/xstatic
%{python3_sitelib}/XStatic_Spin-*
%changelog

42
openstack/XStatic-angular-ui-router/XStatic-angular-ui-router.spec.j2
View File

@ -1,42 +0,0 @@
{% set pypi_name = 'XStatic-angular-ui-router' %}
{% set upstream_version = upstream_version('0.3.1.2') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
%global sname XStatic-angular-ui-router
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: angular-ui-router %{version} (XStatic packaging standard)
License: {{ license('MIT') }}
Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch
%description
angular-ui-router javascript library packaged for setuptools (easy_install) / pip.
%prep
%autosetup -n %{sname}-{{ upstream_version }}
sed -i 's/ setup_requires/# setup_requires/' setup.py
sed -i 's/ version=.*/ version="0.3.1.2",/' setup.py
%py_req_cleanup
%build
%{py2_build}
%install
%{py2_install}
# FIXME(jpena): No *pth files are created by some CIs
rm -f %{buildroot}%{python2_sitelib}/XStatic_angular_ui_router*-nspkg.pth
%files
%doc README.txt
%{python2_sitelib}/xstatic
%{python2_sitelib}/XStatic_angular_ui_router-*.egg-info
%changelog

18
openstack/XStatic-bootswatch/XStatic-bootswatch.spec.j2
View File

@ -3,7 +3,7 @@
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
Name: {{ py2name() }}
Name: {{ py2name(py_versions='py3') }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: bootswatch %{version} (XStatic packaging standard)
@ -12,10 +12,9 @@ Group: Development/Languages/Python
URL: https://opendev.org/openstack/xstatic-bootswatch/
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }}
Requires: {{ py2pkg('XStatic') }}
BuildRequires: {{ py3('setuptools') }}
Requires: {{ py3('XStatic') }}
BuildArch: noarch
%python_subpackages
%description
bootswatch javascript library packaged for setuptools (easy_install) / pip.
@ -25,15 +24,14 @@ bootswatch javascript library packaged for setuptools (easy_install) / pip.
%py_req_cleanup
%build
%{python_build}
%{py3_build}
%install
%{python_install}
%{py3_install}
%files %{python_files}
%files
%doc README.txt
%{python_sitelib}/xstatic
%{python_sitelib}/XStatic_bootswatch-%{version}-py?.?.egg-info
%{python_sitelib}/XStatic_bootswatch-%{version}-py?.?-nspkg.pth
%{python3_sitelib}/xstatic
%{python3_sitelib}/XStatic_bootswatch-*
%changelog