diff --git a/pycadf-2.7.0.tar.gz b/pycadf-2.7.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b17dc73f68e6210f7fe9b9387f8476b7289df121 Binary files /dev/null and b/pycadf-2.7.0.tar.gz differ diff --git a/pycadf-3.1.1.tar.gz b/pycadf-3.1.1.tar.gz deleted file mode 100644 index cc294e78b3debd9437ca3826c6ae0fdd029c071a..0000000000000000000000000000000000000000 Binary files a/pycadf-3.1.1.tar.gz and /dev/null differ diff --git a/python-pycadf.spec b/python-pycadf.spec index 1669b29ee98fbe58f80bae26cc8578757d8356d5..4f92c987eec1256e8d0ae3d74fd5c1edb344a056 100644 --- a/python-pycadf.spec +++ b/python-pycadf.spec @@ -1,76 +1,83 @@ - -Name: python-pycadf -Version: 3.1.1 -Release: 1 -Summary: CADF Python module -License: Apache Software License -URL: https://docs.openstack.org/pycadf/latest/ -Source0: https://files.pythonhosted.org/packages/83/5a/45506b000bf13fee4da64304aec169f9cddd0704add9a0339fd61f76a25c/pycadf-3.1.1.tar.gz -BuildArch: noarch - +%global _empty_manifest_terminate_build 0 +Name: python-pycadf +Version: 2.7.0 +Release: 1 +Summary: CADF Library +License: Apache-2.0 +URL: https://docs.openstack.org/pycadf/latest/ +Source0: https://files.pythonhosted.org/packages/de/fa/a589ac12a1e6ae73dce1a4bbd6400245f165c83654359a6b83fcdcf9cd6e/pycadf-2.7.0.tar.gz +BuildArch: noarch %description -This library provides an auditing data model based on \ -the Cloud Auditing Data Federation specification, primarily \ -for use by OpenStack. The goal is to establish strict expectations \ -about what auditors can expect from audit notifications. - - -%package -n python3-pycadf -Summary: CADF Python module -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pbr - -Requires: python3-debtcollector >= 1.2.0 -Requires: python3-oslo-config -Requires: python3-oslo-serialization >= 2.18.0 -Requires: python3-pytz -Requires: python3-six >= 1.10.0 -Requires: python-pycadf-common = %{version}-%{release} - -%description -n python3-pycadf -This library provides an auditing data model based on \ -the Cloud Auditing Data Federation specification, primarily \ -for use by OpenStack. The goal is to establish strict expectations \ -about what auditors can expect from audit notifications. - -%package -n python-pycadf-common -Summary: CADF Python module - -%description -n python-pycadf-common -This library provides an auditing data model based on \ -the Cloud Auditing Data Federation specification, primarily \ -for use by OpenStack. The goal is to establish strict expectations \ -about what auditors can expect from audit notifications. - + Team and repository tags .. Change things from this point on This library +provides an auditing data model based on the Cloud Auditing Data Federation < +specification, primarily for use by OpenStack. + +%package -n python2-pycadf +Summary: CADF Library +Provides: python2-pycadf +BuildRequires: python2-devel +BuildRequires: python2-setuptools +Requires: python2-oslo-config +Requires: python2-oslo-serialization +Requires: python2-pytz +Requires: python2-six +Requires: python2-debtcollector +%description -n python2-pycadf + Team and repository tags .. Change things from this point on This library +provides an auditing data model based on the Cloud Auditing Data Federation < +specification, primarily for use by OpenStack. + +%package help +Summary: Development documents and examples for pycadf +Provides: python2-pycadf-doc +%description help + Team and repository tags .. Change things from this point on This library +provides an auditing data model based on the Cloud Auditing Data Federation < +specification, primarily for use by OpenStack. %prep - -%setup -q -n pycadf-3.1.1 -rm -rf pycadf.egg-info +%autosetup -n pycadf-2.7.0 %build -%{py3_build} +%py2_build %install -%{py3_install} - -mkdir -p %{buildroot}/%{_sysconfdir} -mv %{buildroot}/usr/etc/pycadf %{buildroot}/%{_sysconfdir}/ - -%files -n python3-pycadf -%{python3_sitelib}/pycadf -%{python3_sitelib}/pycadf-3.1.1-py%{python3_version}.egg-info - -%files -n python-pycadf-common -%doc README.rst -%license LICENSE -%dir %{_sysconfdir}/pycadf -%config(noreplace) %{_sysconfdir}/pycadf/*.conf - +%py2_install +install -d -m755 %{buildroot}/%{_pkgdocdir} +if [ -d doc ]; then cp -arf doc %{buildroot}/%{_pkgdocdir}; fi +if [ -d docs ]; then cp -arf docs %{buildroot}/%{_pkgdocdir}; fi +if [ -d example ]; then cp -arf example %{buildroot}/%{_pkgdocdir}; fi +if [ -d examples ]; then cp -arf examples %{buildroot}/%{_pkgdocdir}; fi +pushd %{buildroot} +if [ -d usr/lib ]; then + find usr/lib -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/etc ]; then + find usr/etc -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/lib64 ]; then + find usr/lib64 -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/bin ]; then + find usr/bin -type f -printf "/%h/%f\n" >> filelist.lst +fi +if [ -d usr/sbin ]; then + find usr/sbin -type f -printf "/%h/%f\n" >> filelist.lst +fi +touch doclist.lst +if [ -d usr/share/man ]; then + find usr/share/man -type f -printf "/%h/%f.gz\n" >> doclist.lst +fi +popd +mv %{buildroot}/filelist.lst . +mv %{buildroot}/doclist.lst . + +%files -n python2-pycadf -f filelist.lst +%dir %{python2_sitelib}/* + +%files help -f doclist.lst +%{_docdir}/* %changelog -* Wed Dec 30 2020 Python_Bot +* Wed May 12 2021 OpenStack_SIG - Package Spec generated - -