40177cdbcf
Our openstack clients are now based upon the master branch. The rpm packaging version should reflect the latest tagged version, as can be discovered by `git describe`. The actual packaging has fallen well behind that target. This update will correct the rpm packaging. Also the current packaging does not advance as new commits are delivered to master. I propose to use the TIS_BASE_SRCREV mechanism to count commits passed the tag. Now this is not ideal as it result in packages looking like this -- python-cinderclient-4.1.0-1.tis.33.src.rpm -- which may seem to imply that tis has authored 33 patches upon python-cinderclient. We are indeed 33 patches beyond tag 4.1.0 (as of this writing), but it is upstream revisions and not stx (tis) revisions that are being counted. We may want further build tool work to implement a second revision counting mechanism to separate upstream revisions from stx revisions. Story: 2004751 Task: 28864 Change-Id: I90fa12084cef1faee52b38c328df078d2f18a001 Signed-off-by: Scott Little <scott.little@windriver.com>
183 lines
4.7 KiB
RPMSpec
183 lines
4.7 KiB
RPMSpec
%{!?upstream_version: %global upstream_version %{version}%{?milestone}}
|
|
|
|
%global sname barbicanclient
|
|
%if 0%{?fedora}
|
|
%global with_python3 1
|
|
%endif
|
|
|
|
%global common_desc \
|
|
This is a client for the Barbican Key Management API. There is a \
|
|
Python library for accessing the API (barbicanclient module), and \
|
|
a command-line script (barbican).
|
|
|
|
Name: python-barbicanclient
|
|
Version: 4.8.1
|
|
Release: 1%{?_tis_dist}.%{tis_patch_ver}
|
|
Summary: Client Library for OpenStack Barbican Key Management API
|
|
|
|
License: ASL 2.0
|
|
URL: https://pypi.python.org/pypi/python-barbicanclient
|
|
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
%description
|
|
%{common_desc}
|
|
|
|
|
|
%package -n python2-%{sname}
|
|
Summary: Client Library for OpenStack Barbican Key Management API
|
|
|
|
BuildRequires: python2-devel
|
|
BuildRequires: python2-pbr
|
|
BuildRequires: python2-pip
|
|
BuildRequires: python2-wheel
|
|
BuildRequires: python2-setuptools
|
|
BuildRequires: git
|
|
|
|
Requires: python2-requests
|
|
Requires: python2-six >= 1.10.0
|
|
Requires: python2-oslo-i18n >= 3.15.3
|
|
Requires: python2-oslo-serialization >= 2.18.0
|
|
Requires: python2-oslo-utils >= 3.33.0
|
|
Requires: python2-prettytable
|
|
Requires: python2-keystoneauth1 >= 3.4.0
|
|
Requires: python2-pbr >= 2.0.0
|
|
%if 0%{?fedora} > 0
|
|
Requires: python2-cliff
|
|
%else
|
|
Requires: python-cliff
|
|
%endif
|
|
|
|
%{?python_provide:%python_provide python2-%{sname}}
|
|
|
|
%description -n python2-%{sname}
|
|
%{common_desc}
|
|
|
|
|
|
%if 0%{?with_python3}
|
|
%package -n python3-%{sname}
|
|
Summary: Client Library for OpenStack Barbican Key Management API
|
|
|
|
BuildRequires: python3-devel
|
|
BuildRequires: python3-pbr
|
|
BuildRequires: python3-setuptools
|
|
|
|
Requires: python3-requests
|
|
Requires: python3-six >= 1.10.0
|
|
Requires: python3-cliff
|
|
Requires: python3-oslo-i18n >= 3.15.3
|
|
Requires: python3-oslo-serialization >= 2.18.0
|
|
Requires: python3-oslo-utils >= 3.33.0
|
|
Requires: python3-prettytable
|
|
Requires: python3-keystoneauth1 >= 3.4.0
|
|
Requires: python3-pbr >= 2.0.0
|
|
|
|
%{?python_provide:%python_provide python3-%{sname}}
|
|
|
|
%description -n python3-%{sname}
|
|
%{common_desc}
|
|
%endif
|
|
|
|
|
|
%package doc
|
|
Summary: Documentation for OpenStack Barbican API client
|
|
|
|
BuildRequires: python2-sphinx
|
|
BuildRequires: python2-openstackdocstheme
|
|
BuildRequires: python2-oslo-utils
|
|
BuildRequires: python2-oslo-i18n
|
|
BuildRequires: python2-prettytable
|
|
|
|
%description doc
|
|
Documentation for the barbicanclient module
|
|
|
|
%prep
|
|
%autosetup -n %{name}-%{upstream_version} -S git
|
|
# let RPM handle deps
|
|
sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
|
|
|
|
rm -rf {test-,}requirements.txt
|
|
|
|
%build
|
|
export PBR_VERSION=%{version}
|
|
%py2_build
|
|
%py2_build_wheel
|
|
%if 0%{?with_python3}
|
|
%py3_build
|
|
%endif
|
|
|
|
# doc
|
|
%{__python2} setup.py build_sphinx -b html
|
|
# Fix hidden-file-or-dir warnings
|
|
rm -fr doc/build/html/.buildinfo
|
|
|
|
%install
|
|
export PBR_VERSION=%{version}
|
|
%if 0%{?with_python3}
|
|
%py3_install
|
|
mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python3_version}
|
|
ln -s ./barbican-%{python3_version} %{buildroot}%{_bindir}/barbican-3
|
|
%endif
|
|
|
|
%py2_install
|
|
mv %{buildroot}%{_bindir}/barbican %{buildroot}%{_bindir}/barbican-%{python2_version}
|
|
ln -s ./barbican-%{python2_version} %{buildroot}%{_bindir}/barbican-2
|
|
ln -s ./barbican-2 %{buildroot}%{_bindir}/barbican
|
|
|
|
# STX: stage wheels
|
|
mkdir -p $RPM_BUILD_ROOT/wheels
|
|
install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/
|
|
|
|
# STX: prep SDK package
|
|
mkdir -p %{buildroot}/usr/share/remote-clients
|
|
tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version}
|
|
|
|
%files -n python2-%{sname}
|
|
%license LICENSE
|
|
%doc AUTHORS CONTRIBUTING.rst README.rst ChangeLog
|
|
%{_bindir}/barbican
|
|
%{_bindir}/barbican-2*
|
|
%{python2_sitelib}/barbicanclient
|
|
%{python2_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
|
|
|
|
%if 0%{?with_python3}
|
|
%files -n python3-%{sname}
|
|
%license LICENSE
|
|
%doc AUTHORS CONTRIBUTING.rst README.rst ChangeLog
|
|
%{_bindir}/barbican-3*
|
|
%{python3_sitelib}/barbicanclient
|
|
%{python3_sitelib}/python_barbicanclient-%{upstream_version}-py?.?.egg-info
|
|
%endif
|
|
|
|
%files doc
|
|
%doc doc/build/html
|
|
%license LICENSE
|
|
|
|
%package sdk
|
|
Summary: SDK files for %{name}
|
|
|
|
%description sdk
|
|
Contains SDK files for %{name} package
|
|
|
|
%files sdk
|
|
/usr/share/remote-clients/%{name}-%{version}.tgz
|
|
|
|
%package wheels
|
|
Summary: %{name} wheels
|
|
|
|
%description wheels
|
|
Contains python wheels for %{name}
|
|
|
|
%files wheels
|
|
/wheels/*
|
|
|
|
%changelog
|
|
* Tue Nov 27 2018 RDO <dev@lists.rdoproject.org> 4.7.1-1
|
|
- Update to 4.7.1
|
|
|
|
* Wed Aug 08 2018 RDO <dev@lists.rdoproject.org> 4.7.0-1
|
|
- Update to 4.7.0
|
|
|