diff --git a/.gitignore b/.gitignore index 78bde8b..904581a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /pdc-client-1.0.0.post2.tar.gz /pdc-client-1.1.0.tar.gz /pdc-client-1.2.0.tar.gz +/pdc-client-1.7.0.tar.gz diff --git a/pdc-client.spec b/pdc-client.spec index 73b53e0..7079132 100644 --- a/pdc-client.spec +++ b/pdc-client.spec @@ -1,15 +1,21 @@ +# Enable Python 3 builds for Fedora %if 0%{?fedora} -%global with_python3 1 +# If the definition isn't available for python3_pkgversion, define it +%{?!python3_pkgversion:%global python3_pkgversion 3} +%bcond_without python3 %else +%bcond_with python3 +%endif + %{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} +%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}} %{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}} -%endif Name: pdc-client -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.7.0 +Release: 2%{?dist} Summary: Console client for interacting with Product Definition Center Group: Development/Libraries License: MIT @@ -28,23 +34,26 @@ BuildRequires: python-mock BuildRequires: python2-beanbag %if 0%{?with_python3} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-nose -BuildRequires: python3-pytest -BuildRequires: python3-requests +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-nose +BuildRequires: python%{python3_pkgversion}-pytest +BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python3-requests-kerberos -BuildRequires: python3-mock +BuildRequires: python%{python3_pkgversion}-mock BuildRequires: python3-beanbag %endif # if with_python3 -%if 0%{?rhel} <= 6 || 0%{?centos} <=6 +%if (0%{?rhel} && 0%{?rhel} <= 6) || (0%{?centos} && 0%{?centos} <= 6) BuildRequires: python-unittest2 BuildRequires: python-argparse %endif -# default to v2 since py3 doesnt' exist really +%if 0%{?with_python3} +Requires: python%{python3_pkgversion}-pdc-client = %{version}-%{release} +%else Requires: python2-pdc-client = %{version}-%{release} +%endif %description This client package contains two separate Product Definition Center clients and @@ -86,16 +95,15 @@ This is a python module for interacting with Product Definition Center programatically. It can handle common authentication and configuration of PDC server connections - %if 0%{?with_python3} -%package -n python3-pdc-client +%package -n python%{python3_pkgversion}-pdc-client Summary: Python 3 client library for Product Definition Center -%{?python_provide:%python_provide python3-pdc-client} +%{?python_provide:%python_provide python%{python3_pkgversion}-pdc-client} Requires: python3-beanbag Requires: python3-requests-kerberos -%description -n python3-pdc-client +%description -n python%{python3_pkgversion}-pdc-client This is a python module for interacting with Product Definition Center programatically. It can handle common authentication and configuration of PDC server connections @@ -120,11 +128,11 @@ find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|' %endif # with_python3 %check -%{__python2} setup.py nosetests || exit 1 +%{__python2} setup.py nosetests %if 0%{?with_python3} pushd %{py3dir} -%{__python3} setup.py nosetests || exit 1 +%{__python3} setup.py nosetests popd %endif # with_python3 @@ -134,6 +142,12 @@ popd %py3_install %endif # with_python3 +# Omit installing plugins with Python packages +rm -r %{buildroot}/%{python_sitelib}/pdc_client/plugins +%if 0%{?with_python3} +rm -r %{buildroot}/%{python3_sitelib}/pdc_client/plugins +%endif # with_python3 + mkdir -p %{buildroot}/%{_mandir}/man1 cp docs/pdc_client.1 %{buildroot}/%{_mandir}/man1/ @@ -177,7 +191,7 @@ EOF %{python_sitelib}/pdc_client* %if 0%{?with_python3} -%files -n python3-pdc-client +%files -n python%{python3_pkgversion}-pdc-client %doc README.markdown %license LICENSE %{python3_sitelib}/pdc_client* @@ -185,6 +199,62 @@ EOF %changelog +* Mon Aug 28 2017 Lukas Holecek 1.7.0-2 +- Omit installing plugins with Python packages + +* Tue Aug 22 2017 Lukas Holecek 1.7.0-1 +- Bump versin in setup.py (lholecek@redhat.com) +- Update spec file from downstream (lholecek@redhat.com) +- Bug fix for ssl_verify in old pdc_client (chuzhang@redhat.com) +- Fix content-delivery-repo list ordering (lholecek@redhat.com) +- Print table with minimum width for content-deliver-repo list + (lholecek@redhat.com) +- Update test data for content-deliver-repo (lholecek@redhat.com) +- Update value type for "Shadow" field (lholecek@redhat.com) +- Increase `pdc content-deliver-repo list` verbosity. (dmach@redhat.com) +- Fix passing ordering parameter (lholecek@redhat.com) +- Make error reporting less verbose (lholecek@redhat.com) +- Omit printing long HTML with error (lholecek@redhat.com) +- Remove unused import (lholecek@redhat.com) +- Simplify reporting server errors. (dmach@redhat.com) +- Modify base_product plugin according to commit 79cbe98 (chuzhang@redhat.com) +- Sort commands in pdc --help. (dmach@redhat.com) +- Remove the arch parameter from option (chcao@redhat.com) +- Use local development plugin directory (lholecek@redhat.com) +- Add content-delivery-repo export/import sub-commands. (dmach@redhat.com) +- Unify json output serialization. (dmach@redhat.com) +- Add base-product command (chcao@redhat.com) +- Add base-product command. (dmach@redhat.com) +- Allow deleting multiple repos at once. (dmach@redhat.com) +- Allow deleting multiple group resource perms at once. (dmach@redhat.com) +- Fix running tests with Travis (lholecek@redhat.com) +- Replace a custom test runner with standard setup.py test. (dmach@redhat.com) +- Allow deleting release variants. (dmach@redhat.com) +- Add "release-variant" command (chcao@redhat.com) +- Add "release-variant" command. (dmach@redhat.com) +- OrderedDict support in python 2.6 (chcao@redhat.com) +- Add "product-version" command. (dmach@redhat.com) +- OrderedDict support in python 2.6 (chcao@redhat.com) +- Add "product" command. (dmach@redhat.com) +- plugin_helpers: Allow overriding 'dest' option. (dmach@redhat.com) +- Fix reading "develop" option from settings (lholecek@redhat.com) +- Fix configuration name in README (lholecek@redhat.com) +- Fix the Sphix dependency (caochuangxiang@gmail.com) +- Change the new token secure with chcao (caochuangxiang@gmail.com) +- Feedback: incorrect place to specify default SSL behavior (ahills@redhat.com) +- Fix SSL command line options (ahills@redhat.com) +- Surport SSL cert when swith insecure to false (bliu@redhat.com) +- Fix the bug about the include-shadow para in repo clone (bliu@redhat.com) + +* Thu Jul 27 2017 Fedora Release Engineering - 1.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jun 21 2017 Lubomír Sedlář - 1.2.0-3 +- Fix dependencies on Python 3 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Tue Dec 27 2016 bliu 1.2.0-1 - Fix the porblem in repo clone (ycheng@redhat.com) - Add the SSL and remove the Warning Info (bliu@redhat.com) diff --git a/sources b/sources index ec5ee3b..96b065b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pdc-client-1.2.0.tar.gz) = 7d9b733814daaefdbb444e1261157b26f8e76541090901c950efce1d5518c64aec5567082956f6c0ae5c8bfaba8a59d4e73d3be755a4096e23ec503c7bf56e6b +SHA512 (pdc-client-1.7.0.tar.gz) = 89157c6eec7fa65871cdf68bfa222626f3b14a11c9f68c23fba3a51fee7fd19475df91e3244a5e77fbbb33eea9b1f861099ab25e151b8eafc92b47b0d52f022a