openstack/rpm-packaging
Code Issues Proposed changes

Merge "Use setuptools instead of distribute (which is part of devel)"

Browse Source
This commit is contained in:
Zuul
2019-03-12 14:20:52 +00:00
committed by Gerrit Code Review
parent 1760bb35ad 3f6d3a34c4
commit bd6efd658d
11 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/XStatic-Angular-Bootstrap/XStatic-Angular-Bootstrap.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-angular-bootstrap/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-Angular-FileUpload/XStatic-Angular-FileUpload.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-angular-fileupload/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-Angular-Gettext/XStatic-Angular-Gettext.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-angular-gettext/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-Angular-Sanitize/XStatic-Angular-Sanitize.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-Angular-lrdragndrop/XStatic-Angular-lrdragndrop.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

20
openstack/XStatic-Bootstrap-Datepicker/XStatic-Bootstrap-Datepicker.spec.j2
View File

@@ -1,14 +1,18 @@
{% set pypi_name = 'XStatic-Bootstrap-Datepicker' %}
{% set upstream_version = upstream_version('1.3.1.0') %}
{% set rpm_release = '1' %}
{% set source = url_pypi() %}
%global sname XStatic-Bootstrap-Datepicker
Name: {{ py2name('XStatic-Bootstrap-Datepicker') }}
Version: 1.3.1.0
Release: 0
Name: {{ py2name() }}
Version: {{ py2rpmversion() }}
Release: {{ py2rpmrelease() }}
Summary: Bootstrap-Datepicker %{version} (XStatic packaging standard)
License: {{ license('Apache-2.0') }}
Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
Source0: {{ source }}
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch
@@ -17,7 +21,7 @@ BuildArch: noarch
Bootstrap-Datepicker javascript library packaged for setuptools (easy_install) / pip.
%prep
%autosetup -n %{sname}-%{version}
%autosetup -n %{sname}-{{ upstream_version }}
%py_req_cleanup
%build
@@ -29,7 +33,7 @@ Bootstrap-Datepicker javascript library packaged for setuptools (easy_install) /
%files
%doc README.txt
%{python2_sitelib}/xstatic
%{python2_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py?.?.egg-info
%{python2_sitelib}/XStatic_Bootstrap_Datepicker-%{version}-py?.?-nspkg.pth
%{python2_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?.egg-info
%{python2_sitelib}/XStatic_Bootstrap_Datepicker-*-py?.?-nspkg.pth
%changelog

1
openstack/XStatic-Bootstrap-SCSS/XStatic-Bootstrap-SCSS.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-D3/XStatic-D3.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-Font-Awesome/XStatic-Font-Awesome.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-Hogan/XStatic-Hogan.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/{sname}/
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch

1
openstack/XStatic-JQuery-Migrate/XStatic-JQuery-Migrate.spec.j2
View File

@@ -8,7 +8,6 @@ Group: Development/Languages/Python
URL: https://git.openstack.org/cgit/openstack/xstatic-jquery-migrate
Source0: https://files.pythonhosted.org/packages/source/X/%{sname}/%{sname}-%{version}.tar.gz
BuildRequires: openstack-macros
BuildRequires: {{ py2pkg('devel') }}
BuildRequires: {{ py2pkg('setuptools') }}
Requires: {{ py2pkg('XStatic') }}
BuildArch: noarch