Attachment 14385 Details for Bug 32857 – rdiff-backup.spec diff for pyproject

[patch] rdiff-backup.spec diff for pyproject

rdiff-backup.spec.patch (text/plain), 2.44 KB, created by Aurelian R on 2024-02-16 18:16:08 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-02-16 18:16:08 CET

Size: 2.44 KB

patch

obsolete

>--- rdiff-backup/SPECS/rdiff-backup.spec	2024-02-16 17:40:04.152133145 +0200
>+++ SPECS/rdiff-backup.spec	2024-02-16 18:42:55.868944648 +0200
>@@ -2,12 +2,14 @@
> #global prel	b0
> 
> # rel for bumping
>-%define rel	2
>+%define rel	1
>+
>+%bcond_without tests
> 
> Name:		rdiff-backup
> Summary:	Convenient and transparent local/remote incremental mirror/backup
> Epoch:		1
>-Version:	2.2.2
>+Version:   2.2.6
> Release:	%mkrel %{?prel:0.%prel.}%{rel}
> License:	GPLv2+
> Group:		Networking/Other
>@@ -17,10 +19,21 @@ BuildRequires:	librsync-devel >= 0.9.6
> BuildRequires:	pkgconfig(python3)
> BuildRequires:	python3dist(setuptools)
> BuildRequires:	python3dist(setuptools-scm)
>+BuildRequires:	python3dist(pyyaml)
>+BuildRequires:	python3dist(twine)
>+%if %{with tests}
>+BuildRequires:	python3dist(pytest)
>+BuildRequires:	python3dist(pytest-cov)
>+BuildRequires:	python3dist(flake8)
>+BuildRequires:	python3dist(bandit)
>+BuildRequires:	python3dist(psutil)
>+BuildRequires:	python3dist(tox)
>+%endif
> 
> #recommended runtime dependencies
> Requires:	python3dist(pylibacl)
> Requires:	python3dist(pyxattr)
>+Requires:	python3dist(psutil)
> 
> %description
> rdiff-backup is a script, written in Python, that backs up one
>@@ -36,33 +49,34 @@ a remote location, and only the differen
> backup will be transmitted.
> 
> %prep
>-%setup -qn %{name}-%{version}%{?prel}
>-%autopatch -p1
>+%autosetup -p1 -n %{name}-%{version}%{?prel}
> 
>-#drop bundled egg-info
>-rm -rf src/rdiff_backup.egg-info/
>+%generate_buildrequires
>+%pyproject_buildrequires -r
> 
> %build
>-%py3_build
>+%pyproject_wheel
> 
> %install
>-%py3_install
>+%pyproject_install
>+%pyproject_save_files rdiff_backup rdiffbackup
> 
> # Remove doc files so we package them with rpmbuild
> rm -rf %{buildroot}%{_docdir}/*
> 
>-%files
>+%check
>+%pyproject_check_import
>+%if %{with tests}
>+# Unsatisfied dependencies
>+rm -v testing/{test_with_profiling.py,utils_simpleps_test.py}
>+%pytest
>+%endif
>+
>+%files -f %{pyproject_files}
> %{_bindir}/rdiff-backup
> %{_bindir}/rdiff-backup-statistics
> %{_bindir}/rdiff-backup-delete
> %{_mandir}/man1/rdiff-backup*
>-%dir %{python3_sitearch}/rdiff_backup
>-%{python3_sitearch}/rdiff_backup/*.py
>-%dir %{python3_sitearch}/rdiff_backup/__pycache__
>-%{python3_sitearch}/rdiff_backup/__pycache__/*.pyc
>-%{python3_sitearch}/rdiff_backup/*.so
>-%{python3_sitearch}/rdiff_backup-*.egg-info
>-%{python3_sitearch}/rdiffbackup/
> %{_datadir}/bash-completion/completions/rdiff-backup
> %doc CHANGELOG.adoc README.adoc
> %doc docs/credits.adoc docs/DEVELOP.adoc docs/examples.adoc

--- rdiff-backup/SPECS/rdiff-backup.spec	2024-02-16 17:40:04.152133145 +0200
+++ SPECS/rdiff-backup.spec	2024-02-16 18:42:55.868944648 +0200
@@ -2,12 +2,14 @@
 #global prel	b0
 
 # rel for bumping
-%define rel	2
+%define rel	1
+
+%bcond_without tests
 
 Name:		rdiff-backup
 Summary:	Convenient and transparent local/remote incremental mirror/backup
 Epoch:		1
-Version:	2.2.2
+Version:   2.2.6
 Release:	%mkrel %{?prel:0.%prel.}%{rel}
 License:	GPLv2+
 Group:		Networking/Other
@@ -17,10 +19,21 @@ BuildRequires:	librsync-devel >= 0.9.6
 BuildRequires:	pkgconfig(python3)
 BuildRequires:	python3dist(setuptools)
 BuildRequires:	python3dist(setuptools-scm)
+BuildRequires:	python3dist(pyyaml)
+BuildRequires:	python3dist(twine)
+%if %{with tests}
+BuildRequires:	python3dist(pytest)
+BuildRequires:	python3dist(pytest-cov)
+BuildRequires:	python3dist(flake8)
+BuildRequires:	python3dist(bandit)
+BuildRequires:	python3dist(psutil)
+BuildRequires:	python3dist(tox)
+%endif
 
 #recommended runtime dependencies
 Requires:	python3dist(pylibacl)
 Requires:	python3dist(pyxattr)
+Requires:	python3dist(psutil)
 
 %description
 rdiff-backup is a script, written in Python, that backs up one
@@ -36,33 +49,34 @@ a remote location, and only the differen
 backup will be transmitted.
 
 %prep
-%setup -qn %{name}-%{version}%{?prel}
-%autopatch -p1
+%autosetup -p1 -n %{name}-%{version}%{?prel}
 
-#drop bundled egg-info
-rm -rf src/rdiff_backup.egg-info/
+%generate_buildrequires
+%pyproject_buildrequires -r
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files rdiff_backup rdiffbackup
 
 # Remove doc files so we package them with rpmbuild
 rm -rf %{buildroot}%{_docdir}/*
 
-%files
+%check
+%pyproject_check_import
+%if %{with tests}
+# Unsatisfied dependencies
+rm -v testing/{test_with_profiling.py,utils_simpleps_test.py}
+%pytest
+%endif
+
+%files -f %{pyproject_files}
 %{_bindir}/rdiff-backup
 %{_bindir}/rdiff-backup-statistics
 %{_bindir}/rdiff-backup-delete
 %{_mandir}/man1/rdiff-backup*
-%dir %{python3_sitearch}/rdiff_backup
-%{python3_sitearch}/rdiff_backup/*.py
-%dir %{python3_sitearch}/rdiff_backup/__pycache__
-%{python3_sitearch}/rdiff_backup/__pycache__/*.pyc
-%{python3_sitearch}/rdiff_backup/*.so
-%{python3_sitearch}/rdiff_backup-*.egg-info
-%{python3_sitearch}/rdiffbackup/
 %{_datadir}/bash-completion/completions/rdiff-backup
 %doc CHANGELOG.adoc README.adoc
 %doc docs/credits.adoc docs/DEVELOP.adoc docs/examples.adoc

Actions: View | Diff

Attachments on bug 32857: 14385 | 14386