From d73fc5856872c5e2a4604818af940fa2c0596c49 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Feb 08 2021 09:22:25 +0000
Subject: pyproject packaging improvements


- don't BR setuptools manually, this package uses poetry
- don't use %pyproject_save_files '*' +auto, it is not encouraged in Fedora
- put %generate_buildrequires after %prep, where it happens
- remove the stay .orig file in %prep to avoid having it listed in %{pyproject_files}

Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>

---

diff --git a/python-matrix-nio.spec b/python-matrix-nio.spec
index c370246..d803e9d 100644
--- a/python-matrix-nio.spec
+++ b/python-matrix-nio.spec
@@ -2,7 +2,7 @@
 
 Name:           python-%{srcname}
 Version:        0.15.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Matrix client library
 
 License:        ISC and ASL 2.0
@@ -22,21 +22,13 @@ enable end-to-end encryption (E2EE).}
 %package -n python3-%{srcname}
 Summary:        %{summary}
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  pyproject-rpm-macros
 
 
 %description -n python3-%{srcname} %_description
 
-%generate_buildrequires
-%pyproject_buildrequires -x e2e
-
 %prep
 %autosetup -n %{srcname}-%{version}
-
-# Remove backup file
-rm -vf nio/events/room_events.py.orig
-
 # Update BRs
 sed \
     -e 's/aiofiles.*/aiofiles = "*"/' \
@@ -44,6 +36,12 @@ sed \
     -e 's/h2.*/h2 = "*"/' \
     -e 's/pycryptodome.*/pycryptodomex = "*"/' \
     -i pyproject.toml
+# Remove backup file
+rm -fv nio/events/room_events.py.orig
+
+
+%generate_buildrequires
+%pyproject_buildrequires -x e2e
 
 %build
 %pyproject_wheel
@@ -51,8 +49,7 @@ sed \
 
 %install
 %pyproject_install
-%pyproject_save_files '*' +auto
-
+%pyproject_save_files nio
 
 %check
 
@@ -62,6 +59,9 @@ sed \
 %doc README.md
 
 %changelog
+* Mon Feb 08 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.15.2-4
+- Manually merge Miro's pyproject packaging improvements to resolve merge conflict
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild