From 7401d399ee376575b390ab807a6abef006766cc1 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Tue, 8 Oct 2019 19:40:02 +0200 Subject: [PATCH] XStatic-*: Fix python3 package names Commit d56c60e0dd7a01 moved the packages to python3 only but didn't fix the package names. Done now. NOTE(dmllr): Adding more cases. Change-Id: I4b677ad2eeaa1864ac5bc1d9cf613cb35b54a177 --- .../XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 | 2 +- .../XStatic-Angular-FileUpload.spec.j2 | 2 +- .../XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 | 2 +- openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 | 2 +- openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 | 2 +- .../XStatic-Angular-lrdragndrop.spec.j2 | 2 +- openstack/XStatic-Angular/XStatic-Angular.spec.j2 | 2 +- .../XStatic-Bootstrap-Datepicker.spec.j2 | 2 +- openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 | 2 +- openstack/XStatic-D3/XStatic-D3.spec.j2 | 2 +- openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 | 2 +- openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 | 2 +- openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 | 2 +- openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 | 2 +- .../XStatic-JQuery.TableSorter.spec.j2 | 2 +- .../XStatic-JQuery.quicksearch.spec.j2 | 2 +- openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 | 2 +- openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 | 2 +- openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 | 2 +- openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 | 2 +- openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 | 2 +- openstack/XStatic-mdi/XStatic-mdi.spec.j2 | 2 +- .../XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 | 2 +- openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 b/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 index a5c6fc41c..45045f2a7 100644 --- a/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 +++ b/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular-Bootstrap %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 b/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 index abede19e7..7b9871553 100644 --- a/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 +++ b/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular-FileUpload %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 b/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 index b23f2e440..214f4a566 100644 --- a/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 +++ b/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular-Gettext %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 b/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 index 4bf50095c..2edcf346f 100644 --- a/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 +++ b/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular-UUID %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 b/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 index 69612fb5a..281a32ec1 100644 --- a/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 +++ b/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular-Vis JavaScript library (XStatic packaging standard) diff --git a/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 b/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 index b35fdb0f8..c04890df4 100644 --- a/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 +++ b/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular-lrdragndrop %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Angular/XStatic-Angular.spec.j2 b/openstack/XStatic-Angular/XStatic-Angular.spec.j2 index b1b95dee9..397d8a004 100644 --- a/openstack/XStatic-Angular/XStatic-Angular.spec.j2 +++ b/openstack/XStatic-Angular/XStatic-Angular.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Angular %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 b/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 index 0d07cdb6a..59e4eb4af 100644 --- a/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 +++ b/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Bootstrap-Datepicker %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 b/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 index d8399cb49..0cbd0344c 100644 --- a/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 +++ b/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Bootstrap-SCSS %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-D3/XStatic-D3.spec.j2 b/openstack/XStatic-D3/XStatic-D3.spec.j2 index 2d9e4601c..38f96a423 100644 --- a/openstack/XStatic-D3/XStatic-D3.spec.j2 +++ b/openstack/XStatic-D3/XStatic-D3.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: D3 %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 b/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 index b263593ba..401b44c25 100644 --- a/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 +++ b/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 @@ -1,6 +1,6 @@ {% set js_name = 'FileSaver' %} %global sname {{ 'XStatic-' + js_name }} -Name: {{ py2name('XStatic-' + js_name) }} +Name: {{ py2name('XStatic-' + js_name, py_versions='py3') }} Version: 1.3.2.0 Release: 0 Summary: {{ js_name }} %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 b/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 index eff59b754..151ef3b0a 100644 --- a/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 +++ b/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Font Awesome %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 b/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 index 76f3b1c21..7de3e4f69 100644 --- a/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 +++ b/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Hogan %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 b/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 index 9c1edaf6f..e423a470e 100644 --- a/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 +++ b/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: JQuery-Migrate %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 b/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 index 5fa40baaf..2259e1a38 100644 --- a/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 +++ b/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: JQuery.TableSorter %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 b/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 index cd89628b0..03b775315 100644 --- a/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 +++ b/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: JQuery.quicksearch %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 b/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 index 8000626e4..ded3d0315 100644 --- a/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 +++ b/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 @@ -1,6 +1,6 @@ {% set js_name = 'JS-Yaml' %} %global sname {{ 'XStatic-' + js_name }} -Name: {{ py2name('XStatic-' + js_name) }} +Name: {{ py2name('XStatic-' + js_name, py_versions='py3') }} Version: 3.8.1.0 Release: 0 Summary: {{ js_name }} %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 b/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 index 7b121c278..6eb9dab0b 100644 --- a/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 +++ b/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: JSEncrypt %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 b/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 index cde51a7c5..d8465502a 100644 --- a/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 +++ b/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Jasmine %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 b/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 index 492e6d400..87f3eb58e 100644 --- a/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 +++ b/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 @@ -1,6 +1,6 @@ {% set js_name = 'Json2yaml' %} %global sname {{ 'XStatic-' + js_name }} -Name: {{ py2name('XStatic-' + js_name) }} +Name: {{ py2name('XStatic-' + js_name, py_versions='py3') }} Version: 0.1.1.0 Release: 0 Summary: {{ js_name }} %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 b/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 index 29a8e6a73..2dbc1b563 100644 --- a/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 +++ b/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 @@ -4,7 +4,7 @@ {% set source = url_pypi() %} %global sname XStatic-Rickshaw -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: Rickshaw %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-mdi/XStatic-mdi.spec.j2 b/openstack/XStatic-mdi/XStatic-mdi.spec.j2 index dd8504aea..828451189 100644 --- a/openstack/XStatic-mdi/XStatic-mdi.spec.j2 +++ b/openstack/XStatic-mdi/XStatic-mdi.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: mdi %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 b/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 index ac06717d1..e3b7398d2 100644 --- a/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 +++ b/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 @@ -3,7 +3,7 @@ {% set rpm_release = '1' %} {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: roboto-fontface %{version} (XStatic packaging standard) diff --git a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 index 705d8cde5..97be05434 100644 --- a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 +++ b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 @@ -4,7 +4,7 @@ {% set source = url_pypi() %} -Name: {{ py2name() }} +Name: {{ py2name(py_versions='py3') }} Version: {{ py2rpmversion() }} Release: {{ py2rpmrelease() }} Summary: smart-table %{version} (XStatic packaging standard)