From 62dbcdb74db2f8e66c73c31d8ddae8eea89fb9a3 Mon Sep 17 00:00:00 2001 From: Jonny Heggheim Date: Apr 19 2023 09:08:17 +0000 Subject: Fixed build error --- diff --git a/0001-Don-t-use-setuptools-scm.patch b/0001-Don-t-use-setuptools-scm.patch deleted file mode 100644 index 5961be0..0000000 --- a/0001-Don-t-use-setuptools-scm.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Emmanuel Arias -Date: Wed, 10 Feb 2021 17:54:51 -0300 -Subject: Don't use setuptools-scm - -Remove depedency of setuptools-scm from setup.py. ---- -Index: python-b2sdk/setup.py -=================================================================== ---- python-b2sdk.orig/setup.py -+++ python-b2sdk/setup.py -@@ -109,8 +109,6 @@ setup( - # for example: - # $ pip install -e .[dev,test] - extras_require={'doc': read_requirements('doc')}, -- setup_requires=['setuptools_scm<6.0'], -- use_scm_version=True, - - # If there are data files included in your packages that need to be - # installed, specify them here. diff --git a/python-b2sdk.spec b/python-b2sdk.spec index 89e837c..1aab0d1 100644 --- a/python-b2sdk.spec +++ b/python-b2sdk.spec @@ -6,9 +6,11 @@ Summary: Backblaze B2 SDK License: MIT URL: https://github.com/Backblaze/b2-sdk-python Source0: %{pypi_source b2sdk} -Patch0: https://salsa.debian.org/python-team/packages/python-b2sdk/-/raw/debian/master/debian/patches/0001-Don-t-use-setuptools-scm.patch BuildArch: noarch +# Fedora does not ship with version 5 or lower +Patch0: relax-setuptools_scm-version.patch + %global _description %{expand: Python library and a few handy utilities for easy access to all of the capabilities of B2 Cloud Storage. @@ -28,7 +30,7 @@ BuildRequires: python3-setuptools_scm %description -n python3-b2sdk %_description %prep -%autosetup -n b2sdk-%{version} +%autosetup -p1 -n b2sdk-%{version} rm -rf b2sdk.egg-info diff --git a/relax-setuptools_scm-version.patch b/relax-setuptools_scm-version.patch new file mode 100644 index 0000000..4aff3a5 --- /dev/null +++ b/relax-setuptools_scm-version.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 486522f2..e189340b 100644 +--- a/setup.py ++++ b/setup.py +@@ -109,7 +109,7 @@ setup( + # for example: + # $ pip install -e .[dev,test] + extras_require={'doc': read_requirements('doc')}, +- setup_requires=['setuptools_scm<6.0'], ++ setup_requires=['setuptools_scm'], + use_scm_version=True, + + # If there are data files included in your packages that need to be