#2 Various packaging enhancements, especially around licenses
Merged 3 months ago by music. Opened 3 months ago by music.
rpms/ music/python-grabbit tidy-202401  into  rawhide

file added
+1562
The added file is too large to be shown here, see it at: 94.patch
file modified
+26 -15
@@ -3,36 +3,49 @@ 

  Release:        %autorelease

  Summary:        Get grabby with file trees

  

- # The bundled grabbit/external/inflect.py is GPLv3+, but we remove it.

- License:        MIT

+ # The entire source is MIT, except:

+ # - The bundled grabbit/external/inflect.py is GPL-3.0-or-later, but we remove

+ #   it in %%prep.

+ # - The bundled versioneer.py (which is not packaged), and the _version.py it

+ #   generates (which is packaged) are CC0-1.0, which is not-allowed for code in

+ #   Fedora, but this case is covered by the following exception

+ #   (https://gitlab.com/fedora/legal/fedora-license-data/-/issues/91#note_1151947383):

+ #

+ #     Existing uses of CC0-1.0 on code files in Fedora packages prior to

+ #     2022-08-01, and subsequent upstream versions of those files in those

+ #     packages, continue to be allowed. We encourage Fedora package maintainers

+ #     to ask upstreams to relicense such files.

+ #   However, we patch the source to update Versioneer to version 0.29, which is

+ #   Unlicense (along with the _version.py it generates).

+ License:        MIT AND Unlicense

  URL:            https://github.com/grabbles/grabbit

- Source0:        %{url}/archive/%{version}/grabbit-%{version}.tar.gz

+ Source:         %{url}/archive/%{version}/grabbit-%{version}.tar.gz

  

  # Update versioneer from 0.18 to 0.21

  # Fixes Python 3.11 compatiblity (RHBZ#2026767)

  # https://github.com/grabbles/grabbit/pull/93

- Patch0:         %{url}/pull/93.patch

+ Patch:          %{url}/pull/93.patch

+ # Update versioneer to 0.29

+ # https://github.com/grabbles/grabbit/pull/94

+ Patch:          %{url}/pull/94.patch

  

  BuildArch:      noarch

  

  BuildRequires:  python3-devel

  

- %global _description %{expand: \

+ %global _description %{expand:

  Grabbit is a lightweight Python package for simple queries over filenames

  within a project. It is geared towards projects or applications with highly

  structured filenames that allow useful queries to be performed without having

- to inspect the file metadata or contents.

- }

+ to inspect the file metadata or contents.}

  

- %description

- %{_description}

+ %description %{_description}

  

  

  %package -n python3-grabbit

  Summary:        %{summary}

  

- %description -n python3-grabbit

- %{_description}

+ %description -n python3-grabbit %{_description}

  

  

  %prep
@@ -59,7 +72,7 @@ 

  

  %install

  %pyproject_install

- %pyproject_save_files grabbit

+ %pyproject_save_files -l grabbit

  

  

  %check
@@ -67,10 +80,8 @@ 

  

  

  %files -n python3-grabbit -f %{pyproject_files}

- # pyproject_files handles LICENSE; verify with “rpm -qL -p …”

- %license LICENSE

  %doc README.md

- %doc examples

+ %doc examples/

  

  

  %changelog

Please see the commit messages for details.

Build succeeded.
https://fedora.softwarefactory-project.io/zuul/buildset/ce2fb009fa994849b627265f7aadd15c

Pull-Request has been merged by music

3 months ago
Metadata