From 150aca7d2a0a1299b9e4d663e6cb3a2426ab694b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Dec 13 2019 20:41:39 +0000 Subject: metadata: Fix setting up tilde version in RPM Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/101 Signed-off-by: Igor Gnatenko --- diff --git a/rust2rpm/inspector.py b/rust2rpm/inspector.py index 1ac4040..2dda6f0 100644 --- a/rust2rpm/inspector.py +++ b/rust2rpm/inspector.py @@ -9,6 +9,7 @@ def main(): group = parser.add_mutually_exclusive_group(required=True) group.add_argument("-n", "--name", action="store_true", help="Print name") group.add_argument("-v", "--version", action="store_true", help="Print version") + group.add_argument("-rv", "--rpm-version", action="store_true", help="Print version (in RPM format)") group.add_argument("-t", "--target-kinds", action="store_true", help="Print target kinds") group.add_argument("-l", "--list-features", action="store_true", help="Print features") group.add_argument("-P", "--provides", action="store_true", help="Print Provides") @@ -36,6 +37,8 @@ def main(): if args.name: print(md.name) if args.version: + print(md._version) + if args.rpm_version: print(md.version) if args.target_kinds: print("\n".join(set(tgt.kind for tgt in md.targets))) diff --git a/rust2rpm/metadata.py b/rust2rpm/metadata.py index 99debf3..8d28985 100644 --- a/rust2rpm/metadata.py +++ b/rust2rpm/metadata.py @@ -219,11 +219,9 @@ class Dependency: class Metadata: def __init__(self, name, version): self.name = name - self._version = version - version_normalized = CargoSemVer.unparse_version( - CargoSemVer.coerce( - CargoSemVer.parse_version(self._version))) - self.version = version_normalized + coerced_version = CargoSemVer.coerce(CargoSemVer.parse_version(version)) + self._version = CargoSemVer.unparse_version(coerced_version) + self.version = CargoSemVer.unparse_version(coerced_version, sep="~") self.license = None self.license_file = None self.readme = None