From d56c60e0dd7a01c4e184ec55c16e14d2ddc08b63 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Mon, 7 Oct 2019 13:54:18 +0200 Subject: [PATCH] XStatic-*: Move to python3 only Horion is python3 only so there is no need to build a python2 package of the XStatic packages. Change-Id: Id3efa8c03015b00fd11ff716e25464499c80811b --- .../XStatic-Angular-Bootstrap.spec.j2 | 17 ++++++++--------- .../XStatic-Angular-FileUpload.spec.j2 | 16 +++++++--------- .../XStatic-Angular-Gettext.spec.j2 | 17 ++++++++--------- .../XStatic-Angular-UUID.spec.j2 | 17 ++++++++--------- .../XStatic-Angular-Vis.spec.j2 | 15 +++++++-------- .../XStatic-Angular-lrdragndrop.spec.j2 | 17 ++++++++--------- .../XStatic-Angular/XStatic-Angular.spec.j2 | 19 +++++++++---------- .../XStatic-Bootstrap-Datepicker.spec.j2 | 17 ++++++++--------- .../XStatic-Bootstrap-SCSS.spec.j2 | 17 ++++++++--------- openstack/XStatic-D3/XStatic-D3.spec.j2 | 17 ++++++++--------- .../XStatic-FileSaver.spec.j2 | 18 ++++++++---------- .../XStatic-Font-Awesome.spec.j2 | 17 ++++++++--------- openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 | 17 ++++++++--------- .../XStatic-JQuery-Migrate.spec.j2 | 17 ++++++++--------- .../XStatic-JQuery.Bootstrap.Wizard.spec.j2 | 14 +++++++------- .../XStatic-JQuery.TableSorter.spec.j2 | 17 ++++++++--------- .../XStatic-JQuery.quicksearch.spec.j2 | 17 ++++++++--------- .../XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 | 18 ++++++++---------- .../XStatic-JSEncrypt.spec.j2 | 17 ++++++++--------- .../XStatic-Jasmine/XStatic-Jasmine.spec.j2 | 17 ++++++++--------- .../XStatic-Json2yaml.spec.j2 | 18 ++++++++---------- .../XStatic-Magic-Search.spec.j2 | 14 +++++++------- .../XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 | 17 ++++++++--------- openstack/XStatic-mdi/XStatic-mdi.spec.j2 | 17 ++++++++--------- .../XStatic-roboto-fontface.spec.j2 | 17 +++++++---------- .../XStatic-smart-table.spec.j2 | 17 ++++++++--------- 26 files changed, 204 insertions(+), 234 deletions(-) diff --git a/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 b/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 index 7238ff69d..a5c6fc41c 100644 --- a/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 +++ b/openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/x/xstatic-angular-bootstrap/ 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 Angular-Bootstrap JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Angular-Bootstrap JavaScript library packaged for setuptools (easy_install) / pi %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_Angular_Bootstrap-*.egg-info -%{python_sitelib}/*-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Angular_Bootstrap-*.egg-info +%{python3_sitelib}/*-nspkg.pth %changelog diff --git a/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 b/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 index 4692aff04..abede19e7 100644 --- a/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 +++ b/openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/x/xstatic-angular-fileupload/ 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 Angular-FileUpload javascript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,14 @@ Angular-FileUpload javascript library packaged for setuptools (easy_install) / p %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_Angular_FileUpload-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Angular_FileUpload-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic* %changelog diff --git a/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 b/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 index c22658324..b23f2e440 100644 --- a/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 +++ b/openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-angular-gettext/ 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 Angular-Gettext javascript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Angular-Gettext 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_Angular_Gettext-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Angular_Gettext-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Angular_Gettext-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Angular_Gettext-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 b/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 index d9a3ea73d..4bf50095c 100644 --- a/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 +++ b/openstack/XStatic-Angular-UUID/XStatic-Angular-UUID.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-angular-uuid/ 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 Angular-UUID JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Angular-UUID 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_Angular_UUID-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Angular_UUID-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Angular_UUID-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Angular_UUID-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 b/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 index 67728fff0..69612fb5a 100644 --- a/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 +++ b/openstack/XStatic-Angular-Vis/XStatic-Angular-Vis.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-angular-vis/ Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('XStatic', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py3('XStatic') }} +BuildRequires: {{ py3('setuptools') }} BuildArch: noarch -%python_subpackages %description Angular-Vis JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,14 +24,14 @@ Angular-Vis 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* +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic* %changelog diff --git a/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 b/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 index 1188c0329..b35fdb0f8 100644 --- a/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 +++ b/openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/{sname}/ 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 lrDragNDrop javascript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ lrDragNDrop 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_Angular_lrdragndrop-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Angular_lrdragndrop-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Angular/XStatic-Angular.spec.j2 b/openstack/XStatic-Angular/XStatic-Angular.spec.j2 index d91f43b25..b1b95dee9 100644 --- a/openstack/XStatic-Angular/XStatic-Angular.spec.j2 +++ b/openstack/XStatic-Angular/XStatic-Angular.spec.j2 @@ -12,11 +12,10 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-angular/ Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('XStatic', py_versions=['py2', 'py3']) }} -BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} -Requires: {{ py2pkg('XStatic') }} +BuildRequires: {{ py3('XStatic') }} +BuildRequires: {{ py3('setuptools') }} +Requires: {{ py3('XStatic') }} BuildArch: noarch -%python_subpackages %description Angular JavaScript library packaged for setuptools (easy_install) / pip. @@ -26,15 +25,15 @@ Angular 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_Angular-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Angular-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Angular-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Angular-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 b/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 index 19a6b35e0..0d07cdb6a 100644 --- a/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 +++ b/openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/XStatic-Bootstrap-Datepicker/ 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 Bootstrap-Datepicker javascript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Bootstrap-Datepicker javascript library packaged for setuptools (easy_install) / %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_Bootstrap_Datepicker-*-py?.?.egg-info -%{python_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?.egg-info +%{python3_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 b/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 index feb9dc58d..d8399cb49 100644 --- a/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 +++ b/openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/XStatic-Bootstrap-SCSS/ 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 Bootstrap style library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Bootstrap style 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_Bootstrap_SCSS-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Bootstrap_SCSS-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-D3/XStatic-D3.spec.j2 b/openstack/XStatic-D3/XStatic-D3.spec.j2 index a9c5c9896..2d9e4601c 100644 --- a/openstack/XStatic-D3/XStatic-D3.spec.j2 +++ b/openstack/XStatic-D3/XStatic-D3.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/XStatic-D3/ 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 D3 javascript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ D3 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_D3-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_D3-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_D3-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_D3-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 b/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 index 39ae53be5..b263593ba 100644 --- a/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 +++ b/openstack/XStatic-FileSaver/XStatic-FileSaver.spec.j2 @@ -1,6 +1,5 @@ {% set js_name = 'FileSaver' %} %global sname {{ 'XStatic-' + js_name }} -{% set build_py_versions = ['py2', 'py3'] %} Name: {{ py2name('XStatic-' + js_name) }} Version: 1.3.2.0 Release: 0 @@ -10,10 +9,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-{{ js_name | lower }}/ Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('setuptools', py_versions=build_py_versions) }} -Requires: {{ py2pkg('XStatic') }} +BuildRequires: {{ py3('setuptools') }} +Requires: {{ py3('XStatic') }} BuildArch: noarch -%python_subpackages %description {{ js_name }} javascript library packaged for setuptools (easy_install) / pip. @@ -23,15 +21,15 @@ BuildArch: noarch %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_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 b/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 index 2139f7028..eff59b754 100644 --- a/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 +++ b/openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-font-awesome/ 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 Font Awesome icons packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Font Awesome icons 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_Font_Awesome-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Font_Awesome-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Font_Awesome-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 b/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 index 2bcc1a412..76f3b1c21 100644 --- a/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 +++ b/openstack/XStatic-Hogan/XStatic-Hogan.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/XStatic-Hogan/ 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 Hogan JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Hogan 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_Hogan-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Hogan-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Hogan-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Hogan-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 b/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 index 1107a62e2..9c1edaf6f 100644 --- a/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 +++ b/openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-jquery-migrate 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 JQuery-Migrate JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ JQuery-Migrate 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_JQuery_Migrate-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_JQuery_Migrate-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2 b/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2 index 7358cfed8..d5a3242c0 100644 --- a/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2 +++ b/openstack/XStatic-JQuery.Bootstrap.Wizard/XStatic-JQuery.Bootstrap.Wizard.spec.j2 @@ -13,8 +13,8 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-jquery.bootstrap.wizard Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('setuptools') }} -Requires: {{ py2pkg('XStatic') }} +BuildRequires: {{ py3('setuptools') }} +Requires: {{ py3('XStatic') }} BuildArch: noarch %description @@ -25,15 +25,15 @@ JQuery.Bootstrap.Wizard JavaScript library packaged for setuptools (easy_install %py_req_cleanup %build -%{py2_build} +%{py3_build} %install -%{py2_install} +%{py3_install} %files %doc README.txt -%{python2_sitelib}/xstatic -%{python2_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.?.egg-info -%{python2_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.?.egg-info +%{python3_sitelib}/XStatic_JQuery.Bootstrap.Wizard-*-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 b/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 index b04d5244b..5fa40baaf 100644 --- a/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 +++ b/openstack/XStatic-JQuery.TableSorter/XStatic-JQuery.TableSorter.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-jquery.tablesorter/ 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 JQuery.TableSorter JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ JQuery.TableSorter JavaScript library packaged for setuptools (easy_install) / p %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_JQuery.TableSorter-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_JQuery.TableSorter-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 b/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 index 518a53b09..cd89628b0 100644 --- a/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 +++ b/openstack/XStatic-JQuery.quicksearch/XStatic-JQuery.quicksearch.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-jquery.quicksearch/ 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 JQuery.quicksearch JavaScript library packaged for setuptools (easy_install) @@ -26,15 +25,15 @@ JQuery.quicksearch JavaScript library packaged for setuptools (easy_install) %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_JQuery.quicksearch-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_JQuery.quicksearch-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 b/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 index bf31b7f5a..8000626e4 100644 --- a/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 +++ b/openstack/XStatic-JS-Yaml/XStatic-JS-Yaml.spec.j2 @@ -1,6 +1,5 @@ {% set js_name = 'JS-Yaml' %} %global sname {{ 'XStatic-' + js_name }} -{% set build_py_versions = ['py2', 'py3'] %} Name: {{ py2name('XStatic-' + js_name) }} Version: 3.8.1.0 Release: 0 @@ -10,10 +9,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-{{ js_name | lower }}/ Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('setuptools', py_versions=build_py_versions) }} -Requires: {{ py2pkg('XStatic') }} +BuildRequires: {{ py3('setuptools') }} +Requires: {{ py3('XStatic') }} BuildArch: noarch -%python_subpackages %description {{ js_name }} javascript library packaged for setuptools (easy_install) / pip. @@ -23,15 +21,15 @@ BuildArch: noarch %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_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 b/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 index c12da3a23..7b121c278 100644 --- a/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 +++ b/openstack/XStatic-JSEncrypt/XStatic-JSEncrypt.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-jsencrypt/ 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 JSEncrypt JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ JSEncrypt 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_JSEncrypt-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_JSEncrypt-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_JSEncrypt-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_JSEncrypt-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 b/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 index 8ab2a5e5c..cde51a7c5 100644 --- a/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 +++ b/openstack/XStatic-Jasmine/XStatic-Jasmine.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-jasmine/ 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 Jasmine JavaScript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ Jasmine 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_Jasmine-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_Jasmine-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Jasmine-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Jasmine-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 b/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 index 8af8667bc..492e6d400 100644 --- a/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 +++ b/openstack/XStatic-Json2yaml/XStatic-Json2yaml.spec.j2 @@ -1,6 +1,5 @@ {% set js_name = 'Json2yaml' %} %global sname {{ 'XStatic-' + js_name }} -{% set build_py_versions = ['py2', 'py3'] %} Name: {{ py2name('XStatic-' + js_name) }} Version: 0.1.1.0 Release: 0 @@ -10,10 +9,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-{{ js_name | lower }}/ Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('setuptools', py_versions=build_py_versions) }} -Requires: {{ py2pkg('XStatic') }} +BuildRequires: {{ py3('setuptools') }} +Requires: {{ py3('XStatic') }} BuildArch: noarch -%python_subpackages %description {{ js_name }} javascript library packaged for setuptools (easy_install) / pip. @@ -23,15 +21,15 @@ BuildArch: noarch %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_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_{{ js_name | replace('-', '_') }}-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2 b/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2 index 0de9581ad..8208f3a66 100644 --- a/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2 +++ b/openstack/XStatic-Magic-Search/XStatic-Magic-Search.spec.j2 @@ -8,8 +8,8 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-magic-search/ Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('setuptools') }} -Requires: {{ py2pkg('XStatic') }} +BuildRequires: {{ py3('setuptools') }} +Requires: {{ py3('XStatic') }} BuildArch: noarch %description @@ -26,15 +26,15 @@ chmod -x README.txt #Remove unneeded files type from source find . -name *~ -exec rm -rf {} \; -%{py2_build} +%{py3_build} %install -%{py2_install} +%{py3_install} %files %doc README.txt -%{python2_sitelib}/xstatic -%{python2_sitelib}/XStatic_Magic_Search-%{version}-py?.?.egg-info -%{python2_sitelib}/XStatic_Magic_Search-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Magic_Search-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_Magic_Search-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 b/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 index dacd4ece5..29a8e6a73 100644 --- a/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 +++ b/openstack/XStatic-Rickshaw/XStatic-Rickshaw.spec.j2 @@ -13,10 +13,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-rickshaw/ 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 Rickshaw JavaScript library packaged for setuptools (easy_install) / pip. @@ -26,15 +25,15 @@ Rickshaw 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_Rickshaw-*-py?.?.egg-info -%{python_sitelib}/XStatic_Rickshaw-*-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_Rickshaw-*-py?.?.egg-info +%{python3_sitelib}/XStatic_Rickshaw-*-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-mdi/XStatic-mdi.spec.j2 b/openstack/XStatic-mdi/XStatic-mdi.spec.j2 index 9fb3f573b..dd8504aea 100644 --- a/openstack/XStatic-mdi/XStatic-mdi.spec.j2 +++ b/openstack/XStatic-mdi/XStatic-mdi.spec.j2 @@ -12,10 +12,9 @@ Group: Development/Languages/Python URL: https://git.openstack.org/cgit/openstack/xstatic-mdi/ 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 mdi javascript library packaged for setuptools (easy_install) / pip. @@ -25,15 +24,15 @@ mdi 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_mdi-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_mdi-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_mdi-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_mdi-%{version}-py?.?-nspkg.pth %changelog diff --git a/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 b/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 index a0b2b0f94..ac06717d1 100644 --- a/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 +++ b/openstack/XStatic-roboto-fontface/XStatic-roboto-fontface.spec.j2 @@ -12,9 +12,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-roboto-fontface/ Source0: {{ source }} BuildRequires: openstack-macros -BuildRequires: {{ py2pkg('setuptools', py_versions=['py2', 'py3']) }} +BuildRequires: {{ py3('XStatic') }} +BuildRequires: {{ py3('setuptools') }} BuildArch: noarch -%python_subpackages %description roboto-fontface javascript library packaged for setuptools (easy_install) / pip. @@ -24,18 +24,15 @@ roboto-fontface 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 %license xstatic/pkg/roboto_fontface/data/LICENSE %doc README.txt -%dir %{python_sitelib}/xstatic -%dir %{python_sitelib}/xstatic/pkg -%{python_sitelib}/xstatic/pkg/roboto_fontface -%{python_sitelib}/*egg-info -%{python_sitelib}/*pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic* %changelog diff --git a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 index 73b2413d0..705d8cde5 100644 --- a/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 +++ b/openstack/XStatic-smart-table/XStatic-smart-table.spec.j2 @@ -13,10 +13,9 @@ Group: Development/Languages/Python URL: https://opendev.org/openstack/xstatic-angular-smart-table/ 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 smart-table javascript library packaged for setuptools (easy_install) / pip. @@ -26,15 +25,15 @@ smart-table 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_smart_table-%{version}-py?.?.egg-info -%{python_sitelib}/XStatic_smart_table-%{version}-py?.?-nspkg.pth +%{python3_sitelib}/xstatic +%{python3_sitelib}/XStatic_smart_table-%{version}-py?.?.egg-info +%{python3_sitelib}/XStatic_smart_table-%{version}-py?.?-nspkg.pth %changelog