!5 使用 pyproject 方式编译并移除help子包

From: @wk333 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot 2023-04-27 05:55:02 +00:00 committed by Gitee
commit e033ec7edb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 17 additions and 71 deletions

View File

@ -1,31 +0,0 @@
From 442decd2a4c9b754e8c674044b85016d4fa99a7d Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Sat, 24 Sep 2022 19:45:06 +0800
Subject: [PATCH] add setup.py
---
setup.py | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 setup.py
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..bac24a4
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+entry_points = \
+{'console_scripts': ['blurb = blurb:main']}
+
+setup(
+ name='blurb',
+ version='1.1.0',
+ py_modules=['blurb'],
+ )
--
2.25.1

View File

@ -1,12 +1,11 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: python-blurb Name: python-blurb
Version: 1.1.0 Version: 1.1.0
Release: 2 Release: 3
Summary: Command-line tool to manage CPython Misc/NEWS.d entries. Summary: Command-line tool to manage CPython Misc/NEWS.d entries.
License: BSD-3-Clause License: BSD-3-Clause
URL: https://github.com/python/core-workflow/tree/master/blurb URL: https://github.com/python/core-workflow/tree/master/blurb
Source0: https://files.pythonhosted.org/packages/71/34/676f8c4a16ac69cc5a1a59d871f6c34d019fb5f36df3a44d4e3e5f4b7362/blurb-1.1.0.tar.gz Source0: https://files.pythonhosted.org/packages/71/34/676f8c4a16ac69cc5a1a59d871f6c34d019fb5f36df3a44d4e3e5f4b7362/blurb-1.1.0.tar.gz
Patch0: 0001-add-setup.py.patch
BuildArch: noarch BuildArch: noarch
@ -16,58 +15,36 @@ blurb is a tool designed to rid CPython core development of the scourge of Misc/
%package -n python3-blurb %package -n python3-blurb
Summary: Command-line tool to manage CPython Misc/NEWS.d entries. Summary: Command-line tool to manage CPython Misc/NEWS.d entries.
Provides: python-blurb Provides: python-blurb
Obsoletes: python-blurb-help <= 1.1.0
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools python3-pip python3-wheel python3-flit
%description -n python3-blurb %description -n python3-blurb
blurb is a tool designed to rid CPython core development of the scourge of Misc/NEWS conflicts. blurb is a tool designed to rid CPython core development of the scourge of Misc/NEWS conflicts.
%package help
Summary: Development documents and examples for blurb
Provides: python3-blurb-doc
%description help
blurb is a tool designed to rid CPython core development of the scourge of Misc/NEWS conflicts.
%prep %prep
%autosetup -n blurb-%{version} -p1 %autosetup -n blurb-%{version} -p1
%build %build
%py3_build %pyproject_build
%install %install
%py3_install %pyproject_install blurb==%{version}
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 .
%files -n python3-blurb -f filelist.lst %check
%dir %{python3_sitelib}/* PYTHONPATH=%{buildroot}%{python3_sitelib} %{buildroot}%{_bindir}/blurb --help
%files help -f doclist.lst %files -n python3-blurb
%{_docdir}/* %{python3_sitelib}/*
%license LICENSE.txt
%doc README.rst
%{_bindir}/blurb
%changelog %changelog
* Thu Apr 27 2023 wangkai <13474090681@163.com> - 1.1.0-3
- Compling package with pyproject
- Obsoletes subpackage python-blurb-help
- Add check for blurb command
* Mon Feb 27 2023 caodongxia <caodongxia@h-partners.com> - 1.1.0-2 * Mon Feb 27 2023 caodongxia <caodongxia@h-partners.com> - 1.1.0-2
- Adaptation to setup.py - Adaptation to setup.py