diff --git a/openstack/distributedcloud-client/centos/distributedcloud-client.spec b/openstack/distributedcloud-client/centos/distributedcloud-client.spec index 7dc83f54..a1eec787 100644 --- a/openstack/distributedcloud-client/centos/distributedcloud-client.spec +++ b/openstack/distributedcloud-client/centos/distributedcloud-client.spec @@ -61,12 +61,6 @@ Summary: DC Manager Client %description dcmanagerclient Distributed Cloud Manager Client -%package sdk -Summary: SDK files for %{pypi_name} - -%description sdk -Contains SDK files for %{pypi_name} package - %prep %autosetup -n %{pypi_name}-%{version} -S git @@ -85,10 +79,6 @@ export PBR_VERSION=%{version} mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ -# prep SDK package -mkdir -p %{buildroot}/usr/share/remote-clients -tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. --transform="s/%{name}-%{version}/%{pypi_name}-%{version}/" %{name}-%{version} - %files dcmanagerclient %license LICENSE %{python2_sitelib}/dcmanagerclient* @@ -96,9 +86,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --excl %exclude %{python2_sitelib}/dcmanagerclient/tests %{_bindir}/dcmanager* -%files sdk -/usr/share/remote-clients/%{pypi_name}-%{version}.tgz - %package wheels Summary: %{name} wheels diff --git a/openstack/python-aodhclient/centos/python-aodhclient.spec b/openstack/python-aodhclient/centos/python-aodhclient.spec index 5e405723..92b9ce78 100644 --- a/openstack/python-aodhclient/centos/python-aodhclient.spec +++ b/openstack/python-aodhclient/centos/python-aodhclient.spec @@ -146,9 +146,6 @@ rm -rf doc/build/html/.{doctrees,buildinfo} 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/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{pypi_name}-%{version} %files -n python2-%{pypi_name} %doc README.rst @@ -183,14 +180,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --excl %doc doc/build/html %license LICENSE -%package sdk -Summary: SDK files for %{pypi_name} - -%description sdk -Contains SDK files for %{pypi_name} package - -%files sdk -/usr/share/remote-clients/%{pypi_name}-%{version}.tgz %package wheels Summary: %{name} wheels diff --git a/openstack/python-barbicanclient/centos/python-barbicanclient.spec b/openstack/python-barbicanclient/centos/python-barbicanclient.spec index bf06f6c5..1c37e45b 100644 --- a/openstack/python-barbicanclient/centos/python-barbicanclient.spec +++ b/openstack/python-barbicanclient/centos/python-barbicanclient.spec @@ -130,9 +130,6 @@ ln -s ./barbican-2 %{buildroot}%{_bindir}/barbican 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 @@ -155,14 +152,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude=' %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 diff --git a/openstack/python-cinderclient/centos/python-cinderclient.spec b/openstack/python-cinderclient/centos/python-cinderclient.spec index bbd4e5ce..4d324db2 100644 --- a/openstack/python-cinderclient/centos/python-cinderclient.spec +++ b/openstack/python-cinderclient/centos/python-cinderclient.spec @@ -145,10 +145,6 @@ install -p -D -m 644 tools/cinder.bash_completion %{buildroot}%{_sysconfdir}/bas install -p -D -m 644 doc/build/man/cinder.1 %{buildroot}%{_mandir}/man1/cinder.1 -# 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} %doc README.rst @@ -172,14 +168,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude=' %files doc %doc doc/build/html -%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 diff --git a/openstack/python-glanceclient/centos/python-glanceclient.spec b/openstack/python-glanceclient/centos/python-glanceclient.spec index b7cc4e67..74796848 100644 --- a/openstack/python-glanceclient/centos/python-glanceclient.spec +++ b/openstack/python-glanceclient/centos/python-glanceclient.spec @@ -155,10 +155,6 @@ rm -rf doc/build/html/.{doctrees,buildinfo} sphinx-build -b man doc/source doc/build/man install -p -D -m 644 doc/build/man/glance.1 %{buildroot}%{_mandir}/man1/glance.1 %endif -# prep SDK package -mkdir -p %{buildroot}/usr/share/remote-clients/%{name} -tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version} - %files -n python2-%{sname} %doc README.rst @@ -191,14 +187,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e %license LICENSE %endif -%package sdk -Summary: SDK files for %{name} - -%description sdk -Contains SDK files for %{name} package - -%files sdk -/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz %package wheels Summary: %{name} wheels diff --git a/openstack/python-gnocchiclient/centos/python-gnocchiclient.spec b/openstack/python-gnocchiclient/centos/python-gnocchiclient.spec index ab0095e3..5931ac2e 100644 --- a/openstack/python-gnocchiclient/centos/python-gnocchiclient.spec +++ b/openstack/python-gnocchiclient/centos/python-gnocchiclient.spec @@ -190,10 +190,6 @@ python setup.py build_sphinx -b html # Fix hidden-file-or-dir warnings rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo -# prep SDK package -mkdir -p %{buildroot}/usr/share/remote-clients -tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{pypi_name}-%{version} - %files -n python2-%{pypi_name} %doc README.rst @@ -228,14 +224,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --excl %files -n python-%{pypi_name}-doc %doc doc/build/html -%package sdk -Summary: SDK files for %{pypi_name} - -%description sdk -Contains SDK files for %{pypi_name} package - -%files sdk -/usr/share/remote-clients/%{pypi_name}-%{version}.tgz %package wheels Summary: %{name} wheels diff --git a/openstack/python-heatclient/centos/python-heatclient.spec b/openstack/python-heatclient/centos/python-heatclient.spec index 82395fec..1900d71b 100644 --- a/openstack/python-heatclient/centos/python-heatclient.spec +++ b/openstack/python-heatclient/centos/python-heatclient.spec @@ -167,10 +167,6 @@ install -p -D -m 644 doc/build/man/heat.1 %{buildroot}%{_mandir}/man1/heat.1 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} %doc README.rst @@ -205,14 +201,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude=' %license LICENSE %endif -%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 diff --git a/openstack/python-keystoneclient/centos/python-keystoneclient.spec b/openstack/python-keystoneclient/centos/python-keystoneclient.spec index 9cf0d241..12e9ec4a 100644 --- a/openstack/python-keystoneclient/centos/python-keystoneclient.spec +++ b/openstack/python-keystoneclient/centos/python-keystoneclient.spec @@ -213,10 +213,6 @@ rm -fr doc/build/html/.{doctrees,buildinfo} 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} - %check stestr --test-path=./keystoneclient/tests/unit run %if 0%{?with_python3} @@ -253,14 +249,6 @@ stestr-3 --test-path=./keystoneclient/tests/unit run %{python3_sitelib}/keystoneclient/tests %endif -%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 diff --git a/openstack/python-muranoclient/centos/build_srpm.data b/openstack/python-muranoclient/centos/build_srpm.data index e84f2d00..aa475187 100644 --- a/openstack/python-muranoclient/centos/build_srpm.data +++ b/openstack/python-muranoclient/centos/build_srpm.data @@ -1,3 +1,3 @@ TAR_NAME="python-muranoclient" SRC_DIR="$CGCS_BASE/git/python-muranoclient" -TIS_PATCH_VER=0 +TIS_PATCH_VER=1 diff --git a/openstack/python-muranoclient/centos/python-muranoclient.spec b/openstack/python-muranoclient/centos/python-muranoclient.spec index efd6ba8d..363e6f62 100644 --- a/openstack/python-muranoclient/centos/python-muranoclient.spec +++ b/openstack/python-muranoclient/centos/python-muranoclient.spec @@ -161,10 +161,6 @@ popd mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ -# 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-%{pypi_name} %license LICENSE @@ -188,14 +184,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}-%{version}.tgz --exclude=' %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 diff --git a/openstack/python-neutronclient/centos/python-neutronclient.spec b/openstack/python-neutronclient/centos/python-neutronclient.spec index 8c92d321..53e8219a 100644 --- a/openstack/python-neutronclient/centos/python-neutronclient.spec +++ b/openstack/python-neutronclient/centos/python-neutronclient.spec @@ -193,10 +193,6 @@ ln -s ./neutron-2 %{buildroot}%{_bindir}/neutron 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/%{name} -tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version} - %check # (TODO) Ignore unit tests results until https://bugs.launchpad.net/python-neutronclient/+bug/1783789 @@ -238,14 +234,6 @@ rm -rf .testrepository %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}/%{name}-%{version}.tgz %package wheels Summary: %{name} wheels diff --git a/openstack/python-novaclient/centos/python-novaclient.spec b/openstack/python-novaclient/centos/python-novaclient.spec index eb161f43..346c5c60 100644 --- a/openstack/python-novaclient/centos/python-novaclient.spec +++ b/openstack/python-novaclient/centos/python-novaclient.spec @@ -145,10 +145,6 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo mkdir -p $RPM_BUILD_ROOT/wheels install -m 644 dist/*.whl $RPM_BUILD_ROOT/wheels/ -# prep SDK package -mkdir -p %{buildroot}/usr/share/remote-clients/%{name} -tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{name}-%{version} - %files -n python2-%{sname} %license LICENSE @@ -184,15 +180,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --e %license LICENSE %endif -%package sdk -Summary: SDK files for %{name} - -%description sdk -Contains SDK files for %{name} package - -%files sdk -/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz - %package wheels Summary: %{name} wheels diff --git a/openstack/python-openstackclient/centos/python-openstackclient.spec b/openstack/python-openstackclient/centos/python-openstackclient.spec index 0ba6d0c3..550c2fca 100644 --- a/openstack/python-openstackclient/centos/python-openstackclient.spec +++ b/openstack/python-openstackclient/centos/python-openstackclient.spec @@ -231,11 +231,6 @@ rm -rf %{buildroot}%{python3_sitelib}/openstackclient/locale 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} - - %check %if 0%{?with_check} %{__python2} setup.py test @@ -274,14 +269,6 @@ rm -rf .testrepository %{python3_sitelib}/*.egg-info %endif -%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 diff --git a/openstack/python-openstacksdk/centos/python-openstacksdk.spec b/openstack/python-openstacksdk/centos/python-openstacksdk.spec index 5a9ae7cc..af47a781 100644 --- a/openstack/python-openstacksdk/centos/python-openstacksdk.spec +++ b/openstack/python-openstacksdk/centos/python-openstacksdk.spec @@ -218,10 +218,6 @@ export PBR_VERSION=%{version} 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/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{pypi_name}-%{version} - %check %if 0%{?do_check} export OS_STDOUT_CAPTURE=true @@ -265,14 +261,6 @@ stestr-3 --test-path ./openstack/tests/unit run %{python3_sitelib}/openstack/tests %endif -%package sdk -Summary: SDK files for %{name} - -%description sdk -Contains SDK files for %{name} package - -%files sdk -/usr/share/remote-clients/%{pypi_name}-%{version}.tgz %package wheels Summary: %{name} wheels diff --git a/openstack/python-osc-lib/centos/build_srpm.data b/openstack/python-osc-lib/centos/build_srpm.data index 70b4b5dc..d3f64f33 100644 --- a/openstack/python-osc-lib/centos/build_srpm.data +++ b/openstack/python-osc-lib/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=2 +TIS_PATCH_VER=3 diff --git a/openstack/python-osc-lib/centos/meta_patches/0003-CGTS-8470-update-remote-client-to-include-osc-lib.patch b/openstack/python-osc-lib/centos/meta_patches/0003-CGTS-8470-update-remote-client-to-include-osc-lib.patch deleted file mode 100644 index 8c5134b4..00000000 --- a/openstack/python-osc-lib/centos/meta_patches/0003-CGTS-8470-update-remote-client-to-include-osc-lib.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7389923ee13be16dffcd7b1f68a5794ef5ecc248 Mon Sep 17 00:00:00 2001 -From: Andy Ning -Date: Wed, 6 Dec 2017 17:18:36 -0500 -Subject: [PATCH 1/1] CGTS-8470: update remote client to include osc-lib - -Currently remote client built from sdk doesn't include osc-lib. -The patch added osc-lib in since it is patched. ---- - SPECS/python-osc-lib.spec | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/SPECS/python-osc-lib.spec b/SPECS/python-osc-lib.spec -index e035b22..2ae8629 100644 ---- a/SPECS/python-osc-lib.spec -+++ b/SPECS/python-osc-lib.spec -@@ -94,6 +94,12 @@ osc-lib is a package of common support modules for writing OSC plugins. - - This package contains the documentation. - -+%package sdk -+Summary: SDK files for %{library} -+ -+%description sdk -+Contains SDK files for %{library} package -+ - %if 0%{?with_python3} - %package -n python3-%{library} - Summary: OpenStack Example library -@@ -192,6 +198,10 @@ rm -rf .testrepository - %endif - %{__python2} setup.py test - -+# prep SDK package -+mkdir -p %{buildroot}/usr/share/remote-clients/%{name} -+tar zcf %{buildroot}/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{library}-%{upstream_version} -+ - %files -n python2-%{library} - %license LICENSE - %{python2_sitelib}/%{module} -@@ -218,6 +228,9 @@ rm -rf .testrepository - %{python3_sitelib}/%{module}/tests - %endif # with_python3 - -+%files sdk -+/usr/share/remote-clients/%{name}/%{name}-%{version}.tgz -+ - %changelog - * Sat Aug 12 2017 Alfredo Moralejo 1.7.0-1 - - Update to 1.7.0 --- -1.8.3.1 - diff --git a/openstack/python-osc-lib/centos/meta_patches/PATCH_ORDER b/openstack/python-osc-lib/centos/meta_patches/PATCH_ORDER index b2ddb07d..99406caa 100644 --- a/openstack/python-osc-lib/centos/meta_patches/PATCH_ORDER +++ b/openstack/python-osc-lib/centos/meta_patches/PATCH_ORDER @@ -1,4 +1,2 @@ 0001-Update-package-versioning-for-TIS-format.patch 0002-CGTS-7947-add-os-keystone-region-name-option-to-open.patch -0003-CGTS-8470-update-remote-client-to-include-osc-lib.patch - diff --git a/openstack/python-pankoclient/centos/python-pankoclient.spec b/openstack/python-pankoclient/centos/python-pankoclient.spec index 7bd53d85..64a03932 100644 --- a/openstack/python-pankoclient/centos/python-pankoclient.spec +++ b/openstack/python-pankoclient/centos/python-pankoclient.spec @@ -169,11 +169,6 @@ rm -rf doc/build/html/.doctrees doc/build/html/.buildinfo 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/%{pypi_name}-%{version}.tgz --exclude='.gitignore' --exclude='.gitreview' -C .. %{pypi_name}-%{version} - - %files -n python2-%{pypi_name} %doc README.rst %license LICENSE @@ -211,15 +206,6 @@ tar zcf %{buildroot}/usr/share/remote-clients/%{pypi_name}-%{version}.tgz --excl %doc doc/build/html %license LICENSE -%package sdk -Summary: SDK files for %{pypi_name} - -%description sdk -Contains SDK files for %{pypi_name} package - -%files sdk -/usr/share/remote-clients/%{pypi_name}-%{version}.tgz - %package wheels Summary: %{name} wheels