From 7e969ffbb3f73b9bf88c5ab028faac4688efe854 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Wed, 15 Feb 2023 18:21:31 +0100 Subject: [PATCH] crate: fix sorting of license and doc files --- rust2rpm/__init__.py | 6 ++++-- rust2rpm/crate.py | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rust2rpm/__init__.py b/rust2rpm/__init__.py index 9f3611e..8a0bf13 100644 --- a/rust2rpm/__init__.py +++ b/rust2rpm/__init__.py @@ -5,10 +5,12 @@ from rust2rpm import licensing # - Increment major version if rendered spec files have changed # (for example, because of changes to the template). # - Increment only the minor version if spec file rendering is unchanged since -# the release of the last major version. +# the release of the last major version, but new features were added. +# - Increment only the patch version if there were only bug fixes since the +# release of the last minor version. # # Only the major version is included in the header of generated spec files. -__version__ = "24.0-pre" +__version__ = "24.0.0-pre" TARGET_ARCHES = [ "x86_64", diff --git a/rust2rpm/crate.py b/rust2rpm/crate.py index ecc1334..c0030f9 100644 --- a/rust2rpm/crate.py +++ b/rust2rpm/crate.py @@ -112,6 +112,7 @@ def get_license_files(path: str) -> list[str]: if LICENSE_FILE_PATTERN.match(f): results.append(os.path.relpath(os.path.join(root, f), path)) + results.sort() return results @@ -130,6 +131,7 @@ def get_doc_files(path: str) -> list[str]: ): results.append(os.path.relpath(os.path.join(root, f), path)) + results.sort() return results