From 62ce153b2f4826062bbde2dca96c3a08c3ad2bf8 Mon Sep 17 00:00:00 2001
From: huangtianhua <huangtianhua@huawei.com>
Date: Mon, 1 Aug 2022 17:00:51 +0800
Subject: [PATCH] Fix dist error

---
 python-tomli.spec | 91 ++++++++++++++++++++++++++++++-----------------
 setup.py          |  4 +++
 2 files changed, 62 insertions(+), 33 deletions(-)
 create mode 100644 setup.py

diff --git a/python-tomli.spec b/python-tomli.spec
index 62ac37f..bfaefe4 100644
--- a/python-tomli.spec
+++ b/python-tomli.spec
@@ -1,60 +1,85 @@
+%global _empty_manifest_terminate_build 0
 Name:           python-tomli
 Version:        2.0.1
-Release:        1
-Summary:        A little TOML parser for Python
+Release:        2
+Summary:        A lil' TOML parser
 License:        MIT
 URL:            https://github.com/hukkin/tomli
 Source0:        https://files.pythonhosted.org/packages/c0/3f/d7af728f075fb08564c5949a9c95e44352e23dee646869fa104a3b2060a3/tomli-2.0.1.tar.gz
+Source1:        setup.py
 BuildArch:      noarch
+%description
+Tomli is a Python library for parsing TOML.
 
+%package -n python3-tomli
+Summary:        A lil' TOML parser
+Provides:       python-tomli
+# Base build requires
 BuildRequires:  python3-devel
-BuildRequires:  python3-pytest
-BuildRequires:  python3-dateutil
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pbr
 BuildRequires:  python3-pip
 BuildRequires:  python3-wheel
-
-%global _description %{expand:
+%description -n python3-tomli
 Tomli is a Python library for parsing TOML.
-Tomli is fully compatible with TOML v1.0.0.}
 
-%description %_description
-
-%package -n python3-tomli
-Summary:        %{summary}
-
-%description -n python3-tomli %_description
+%package help
+Summary:        A lil' TOML parser
+Provides:       python3-tomli-doc
+%description help
+Tomli is a Python library for parsing TOML.
 
 %prep
-%autosetup -p1 -n tomli-%{version}
+%autosetup -n tomli-%{version}
+cp %{SOURCE1} ./
 
 %build
-%global distinfo tomli-%{version}+rpmbootstrap.dist-info
-mkdir %{distinfo}
-cat > %{distinfo}/METADATA << EOF
-Metadata-Version: 2.2
-Name: tomli
-Version: %{version}+rpmbootstrap
-EOF
+%py3_build
 
 %install
-mkdir -p %{buildroot}%{python3_sitelib}
-cp -a src/tomli %{distinfo} %{buildroot}%{python3_sitelib}
-echo '%{python3_sitelib}/tomli/' > %{pyproject_files}
-echo '%{python3_sitelib}/%{distinfo}/' >> %{pyproject_files}
+%py3_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/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 .
+
+%check
+%{__python3} setup.py test
 
-#%check
-#no test items
-#pytest
+%files -n python3-tomli -f filelist.lst
+%dir %{python3_sitelib}/*
 
-%files -n python3-tomli -f %{pyproject_files}
-%doc README.md
-%license LICENSE
+%files help -f doclist.lst
+%{_docdir}/*
 
 %changelog
-* Sat Jun 04 2022 OpenStack_SIG <openstack@openeuler.org> - 2.0.1-1
-- Upgrade python3-tomli to version 2.0.1
+* Sat Jun 04 2022 OpenStack_SIG <openstack@openeuler.org> - 2.0.1-2
+- Fix dist package generation error
 
+* Mon Aug 01 2022 OpenStack_SIG <openstack@openeuler.org> - 2.0.1-1
+- Upgrade package python3-tomli to version 2.0.1
+ 
 * Tue Mar 1 2022 zhangy <zhangy1317@foxmai.com> - 2.0.0
 - Init packages
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..1abbd06
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,4 @@
+import setuptools
+
+if __name__ == "__main__":
+    setuptools.setup()
-- 
Gitee