commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2020-08-15 21:12:59 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.3399 (New) Package is "rust-packaging" Sat Aug 15 21:12:59 2020 rev:11 rq:826545 version:15 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2020-05-26 17:20:31.844130934 +0200 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.3399/rust-srpm-macros.changes 2020-08-15 21:13:07.795377032 +0200 @@ -1,0 +2,6 @@ +Thu Aug 13 20:21:48 UTC 2020 - Neal Gompa + +- Backport patch to add 64-bit RISC-V support + + Patch: 0001-Add-riscv64-to-rust_arches.patch + +--- New: 0001-Add-riscv64-to-rust_arches.patch Other differences: -- ++ rust-srpm-macros.spec ++ --- /var/tmp/diff_new_pack.6atDc4/_old 2020-08-15 21:13:09.023377719 +0200 +++ /var/tmp/diff_new_pack.6atDc4/_new 2020-08-15 21:13:09.023377719 +0200 @@ -28,6 +28,9 @@ URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz +# Backports from upstream +Patch0001: 0001-Add-riscv64-to-rust_arches.patch + BuildArch: noarch %description ++ 0001-Add-riscv64-to-rust_arches.patch ++ >From 8dcf85131987aae3bb05fc6f147374a319045b56 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 13 Aug 2020 21:24:06 +0200 Subject: [PATCH] Add riscv64 to %rust_arches Signed-off-by: Andreas Schwab --- data/macros.rust-srpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/macros.rust-srpm b/data/macros.rust-srpm index 88d5a0f..8814f5a 100644 --- a/data/macros.rust-srpm +++ b/data/macros.rust-srpm @@ -1,4 +1,4 @@ -%rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x +%rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le riscv64 s390x %version_no_tilde() %{lua: local sep = rpm.expand('%1') local ver = rpm.expand('%2') -- 2.26.2
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2020-05-26 17:20:30 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.2738 (New) Package is "rust-packaging" Tue May 26 17:20:30 2020 rev:10 rq:808277 version:15 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2020-04-04 12:26:41.880006477 +0200 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.2738/rust-packaging.changes 2020-05-26 17:20:31.724130676 +0200 @@ -1,0 +2,14 @@ +Fri May 22 13:48:07 UTC 2020 - Neal Gompa + +- Update to 15 + + metadata: Fix setting up tilde version in RPM + + templates: Generate files entry with no-tilde + + inspector: Add support for multiple features + + metadata: Support "renamed" dependencies + + Use `cargo install --no-track` with cargo 1.41 + + metadata: support versions like X.*.* + + Fix up Cargo.toml.orig error message that started to appear with Rust 1.43.0 +- Remove downstream patch + + cargo-install.patch + +--- --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2019-12-05 17:33:48.269452719 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.2738/rust-srpm-macros.changes 2020-05-26 17:20:31.844130934 +0200 @@ -1,0 +2,12 @@ +Fri May 22 13:48:07 UTC 2020 - Neal Gompa + +- Update to 15 + + metadata: Fix setting up tilde version in RPM + + templates: Generate files entry with no-tilde + + inspector: Add support for multiple features + + metadata: Support "renamed" dependencies + + Use `cargo install --no-track` with cargo 1.41 + + metadata: support versions like X.*.* + + Fix up Cargo.toml.orig error message that started to appear with Rust 1.43.0 + +--- Old: cargo-install.patch rust2rpm-11.tar.xz New: rust2rpm-15.tar.xz Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.eMyjra/_old 2020-05-26 17:20:32.560132474 +0200 +++ /var/tmp/diff_new_pack.eMyjra/_new 2020-05-26 17:20:32.564132482 +0200 @@ -4,7 +4,7 @@ # Copyright (c) 2020 SUSE LLC # Copyright (c) 2017 Red Hat, Inc., Raleigh, North Carolina, United States of America. # Copyright (c) 2017, 2019 Igor Gnatenko . -# Copyright (c) 2019 Neal Gompa . +# Copyright (c) 2020 Neal Gompa . # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,14 +22,13 @@ %bcond_without check Name: rust-packaging -Version:11 +Version:15 Release:0 Summary:RPM macros for building Rust packages on various architectures License:MIT Group: Development/Languages/Rust URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz -Patch0: cargo-install.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch ++ rust-srpm-macros.spec ++ --- /var/tmp/diff_new_pack.eMyjra/_old 2020-05-26 17:20:32.584132525 +0200 +++ /var/tmp/diff_new_pack.eMyjra/_new 2020-05-26 17:20:32.588132534 +0200 @@ -4,7 +4,7 @@ # Copyright (c) 2020 SUSE LLC # Copyright (c) 2017 Red Hat, Inc., Raleigh, North Carolina, United States of America. # Copyright (c) 2017, 2019 Igor Gnatenko . -# Copyright (c) 2019 Neal Gompa . +# Copyright (c) 2020 Neal Gompa . # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: rust-srpm-macros -Version:11 +Version:15 Release:0 Summary:RPM macros for building Rust source packages License:MIT ++ rust2rpm-11.tar.xz -> rust2rpm-15.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust2rpm-11/data/cargo.attr new/rust2rpm-15/data/cargo.attr --- old/rust2rpm-11/data/cargo.attr 2019-12-04 07:56:50.0 +0100 +++ new/rust2rpm-15/data/cargo.attr 2020-05-22 15:54:31.0 +0200 @@ -1,3 +1,3 @@ -%__cargo_provides %{_bindir}/cargo-inspector --provides --feature=%{__cargo_feature_from_name -n %{name}} -%__cargo_requires %{_bindir}/cargo-inspector --requires --feature=%{__cargo_feature_from_name -n %{name}} +%__cargo_provides %{_bindir}/cargo-inspector --provides --features=%{__cargo_feature_from_name -n %{name}} +%__cargo_requires %{_bindir}/cargo-inspector --requires --features=%{__cargo_feature_from_name -n %{name}}
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2020-04-04 12:25:53 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.3248 (New) Package is "rust-packaging" Sat Apr 4 12:25:53 2020 rev:9 rq:791137 version:11 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2019-12-05 17:33:48.217452727 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.3248/rust-packaging.changes 2020-04-04 12:26:41.880006477 +0200 @@ -1,0 +2,6 @@ +Tue Mar 31 14:49:17 UTC 2020 - Andreas Schwab + +- cargo-install.patch: Use `cargo install --no-track` with cargo 1.41 +- Require cargo >= 1.41 + +--- New: cargo-install.patch Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.XbnAi8/_old 2020-04-04 12:26:43.672008330 +0200 +++ /var/tmp/diff_new_pack.XbnAi8/_new 2020-04-04 12:26:43.676008334 +0200 @@ -1,7 +1,7 @@ # # spec file for package rust-packaging # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017 Red Hat, Inc., Raleigh, North Carolina, United States of America. # Copyright (c) 2017, 2019 Igor Gnatenko . # Copyright (c) 2019 Neal Gompa . @@ -29,11 +29,12 @@ Group: Development/Languages/Rust URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz +Patch0: cargo-install.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch # gawk is needed for stripping dev-deps in macro, 4.1.0 is needed for inplace feature -Requires: cargo +Requires: cargo >= 1.41 Requires: gawk >= 4.1.0 Requires: python3-rust2rpm = %{version}-%{release} Requires: rust ++ rust-srpm-macros.spec ++ --- /var/tmp/diff_new_pack.XbnAi8/_old 2020-04-04 12:26:43.692008351 +0200 +++ /var/tmp/diff_new_pack.XbnAi8/_new 2020-04-04 12:26:43.696008354 +0200 @@ -1,7 +1,7 @@ # # spec file for package rust-srpm-macros # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2017 Red Hat, Inc., Raleigh, North Carolina, United States of America. # Copyright (c) 2017, 2019 Igor Gnatenko . # Copyright (c) 2019 Neal Gompa . ++ cargo-install.patch ++ >From b4581d8f5ba5e48de9a97988d95739b364222acd Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Thu, 30 Jan 2020 22:02:59 -0800 Subject: [PATCH] Use `cargo install --no-track` with cargo 1.41 In cargo 1.41, `cargo install` adds a new `.crates2.json` file in the install root for tracking version upgrades. This would be another file that `%cargo_install` should remove afterward, but there is also a new `--no-track` option which disables such metadata files altogether. This update should be coordinated with the Rust toolchain update in the distro, e.g. with rust-packaging `Requires: cargo >= 1.41`. The new option will be rejected as an unstable option on earlier versions. --- data/macros.cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/macros.cargo b/data/macros.cargo index 5f60111..a916699 100644 --- a/data/macros.cargo +++ b/data/macros.cargo @@ -101,11 +101,11 @@ fi \ %{shrink:\ %{__cargo} install\ %{__cargo_common_opts} \ +--no-track \ --path .\ %{__cargo_parse_opts %{-n} %{-a} %{-f:-f%{-f*}}}\ %* \ } \ -%{__rm} %{buildroot}%{_prefix}/.crates.toml \ fi \ %endif \ ) -- 2.26.0
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2019-12-05 17:33:46 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.4691 (New) Package is "rust-packaging" Thu Dec 5 17:33:46 2019 rev:8 rq:754086 version:11 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2019-10-31 22:26:08.472388226 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.4691/rust-packaging.changes 2019-12-05 17:33:48.217452727 +0100 @@ -1,0 +2,18 @@ +Wed Dec 4 15:06:39 UTC 2019 - Igor Gnatenko + +- Remove downstream patches + + 0001-Ignore-Cargo.lock.patch + + 0001-macros-Remove-Cargo.toml.orig.patch + + 0001-metadata-normalize-version-via-CargoSemVer.patch + + 0001-metadata-replace-semantic-version-with-a-custom-pars.patch +- Update to 11 + + When dynamic BuildRequires are turned on, propagate arguments to %cargo_* + + Few improvements in algorithm of description splitting into a summary + + Ignore Cargo.lock for installation (publish lockfile feature in Cargo 1.37+) + + Replace semantic_version dependency by custom parser + + Add MPL-2.0-or-later and 0BSD into a Fedora SPDX mapping + + Pass --cap-lints=warn into the RUSTFLAGS to prevent FTBFS after +dependency and/or compiler updates + + Enable dynamic BuildRequires by default for Fedora target + +--- --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2019-08-30 14:41:42.105419128 +0200 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.4691/rust-srpm-macros.changes 2019-12-05 17:33:48.269452719 +0100 @@ -1,0 +2,5 @@ +Wed Dec 4 15:06:39 UTC 2019 - Igor Gnatenko + +- Update to 11 + +--- Old: 0001-Ignore-Cargo.lock.patch 0001-macros-Remove-Cargo.toml.orig.patch 0001-metadata-normalize-version-via-CargoSemVer.patch 0001-metadata-replace-semantic-version-with-a-custom-pars.patch rust2rpm-10.tar.xz New: rust2rpm-11.tar.xz Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.gqg2Ty/_old 2019-12-05 17:33:48.913452628 +0100 +++ /var/tmp/diff_new_pack.gqg2Ty/_new 2019-12-05 17:33:48.913452628 +0100 @@ -22,21 +22,13 @@ %bcond_without check Name: rust-packaging -Version:10 +Version:11 Release:0 Summary:RPM macros for building Rust packages on various architectures License:MIT Group: Development/Languages/Rust URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz -# PATCH-FIX-OPENSUSE 0001-macros-Remove-Cargo.toml.orig.patch -- Remove Cargo.toml.orig -Patch0001: 0001-macros-Remove-Cargo.toml.orig.patch -# PATCH-FIX-UPSTREAM 0001-Ignore-Cargo.lock.patch -- https://pagure.io/fedora-rust/rust2rpm/c/b5e2db003fe02d689d9e724a1d649d2c6d2919dd?branch=master -Patch0002: 0001-Ignore-Cargo.lock.patch -# PATCH-FIX-UPSTREAM 0001-metadata-replace-semantic-version-with-a-custom-pars.patch -- https://pagure.io/fedora-rust/rust2rpm/c/fcbf95a78efdb310f918363e69706e1a98d93a9f -Patch0003: 0001-metadata-replace-semantic-version-with-a-custom-pars.patch -# PATCH-FIX-UPSTREAM 0001-metadata-normalize-version-via-CargoSemVer.patch -- https://pagure.io/fedora-rust/rust2rpm/c/23e807d8ce571da4500f66075e08bfa412177972 -Patch0004: 0001-metadata-normalize-version-via-CargoSemVer.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch ++ rust-srpm-macros.spec ++ --- /var/tmp/diff_new_pack.gqg2Ty/_old 2019-12-05 17:33:48.937452625 +0100 +++ /var/tmp/diff_new_pack.gqg2Ty/_new 2019-12-05 17:33:48.937452625 +0100 @@ -20,7 +20,7 @@ Name: rust-srpm-macros -Version:10 +Version:11 Release:0 Summary:RPM macros for building Rust source packages License:MIT ++ rust2rpm-10.tar.xz -> rust2rpm-11.tar.xz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rust2rpm-10/data/macros.cargo new/rust2rpm-11/data/macros.cargo --- old/rust2rpm-10/data/macros.cargo 2019-06-16 17:14:52.0 +0200 +++ new/rust2rpm-11/data/macros.cargo 2019-12-04 07:56:50.0 +0100 @@ -90,7 +90,7 @@ # so that cargo doesn't fail resolving dependencies:\ # https://github.com/rust-lang/cargo/pull/6729 \ %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \ - %{__cargo} pa
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2019-10-31 22:26:06 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.2990 (New) Package is "rust-packaging" Thu Oct 31 22:26:06 2019 rev:7 rq:744324 version:10 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2019-10-28 17:00:19.713755137 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.2990/rust-packaging.changes 2019-10-31 22:26:08.472388226 +0100 @@ -1,0 +2,6 @@ +Wed Oct 30 22:34:38 UTC 2019 - Neal Gompa + +- Fix version normalization via CargoSemVer + + 0001-metadata-normalize-version-via-CargoSemVer.patch + +--- New: 0001-metadata-normalize-version-via-CargoSemVer.patch Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.R3eJ0V/_old 2019-10-31 22:26:09.852390085 +0100 +++ /var/tmp/diff_new_pack.R3eJ0V/_new 2019-10-31 22:26:09.868390107 +0100 @@ -35,6 +35,8 @@ Patch0002: 0001-Ignore-Cargo.lock.patch # PATCH-FIX-UPSTREAM 0001-metadata-replace-semantic-version-with-a-custom-pars.patch -- https://pagure.io/fedora-rust/rust2rpm/c/fcbf95a78efdb310f918363e69706e1a98d93a9f Patch0003: 0001-metadata-replace-semantic-version-with-a-custom-pars.patch +# PATCH-FIX-UPSTREAM 0001-metadata-normalize-version-via-CargoSemVer.patch -- https://pagure.io/fedora-rust/rust2rpm/c/23e807d8ce571da4500f66075e08bfa412177972 +Patch0004: 0001-metadata-normalize-version-via-CargoSemVer.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch ++ 0001-metadata-normalize-version-via-CargoSemVer.patch ++ >From 23e807d8ce571da4500f66075e08bfa412177972 Mon Sep 17 00:00:00 2001 From: Alberto Planas Date: Wed, 30 Oct 2019 17:28:32 +0100 Subject: [PATCH] metadata: normalize version via CargoSemVer --- rust2rpm/metadata.py | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rust2rpm/metadata.py b/rust2rpm/metadata.py index 6dd8bb0..99debf3 100644 --- a/rust2rpm/metadata.py +++ b/rust2rpm/metadata.py @@ -220,10 +220,10 @@ class Metadata: def __init__(self, name, version): self.name = name self._version = version -version_normalized = Dependency._normalize_req(f"={self._version}") -if len(version_normalized) != 1: -raise Exception(f"Incorrect version: {self._version}") -self.version = version_normalized[0][1] +version_normalized = CargoSemVer.unparse_version( +CargoSemVer.coerce( +CargoSemVer.parse_version(self._version))) +self.version = version_normalized self.license = None self.license_file = None self.readme = None -- 2.21.0
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2019-10-28 16:59:15 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.2990 (New) Package is "rust-packaging" Mon Oct 28 16:59:15 2019 rev:6 rq:743471 version:10 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2019-08-30 14:41:41.957419143 +0200 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.2990/rust-packaging.changes 2019-10-28 17:00:19.713755137 +0100 @@ -1,0 +2,13 @@ +Mon Oct 28 11:26:33 UTC 2019 - Neal Gompa + +- Replace semantic_version dependency with custom CargoVersion parser + + Add 0001-metadata-replace-semantic-version-with-a-custom-pars.patch + +--- +Tue Oct 22 04:28:37 UTC 2019 - Thomas Bechtold + +- Add 0001-Ignore-Cargo.lock.patch + This fixes build problems when the .crate file contains a Cargo.lock + file + +--- New: 0001-Ignore-Cargo.lock.patch 0001-metadata-replace-semantic-version-with-a-custom-pars.patch Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.lBIn2F/_old 2019-10-28 17:00:20.409755973 +0100 +++ /var/tmp/diff_new_pack.lBIn2F/_new 2019-10-28 17:00:20.413755978 +0100 @@ -31,7 +31,10 @@ Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz # PATCH-FIX-OPENSUSE 0001-macros-Remove-Cargo.toml.orig.patch -- Remove Cargo.toml.orig Patch0001: 0001-macros-Remove-Cargo.toml.orig.patch - +# PATCH-FIX-UPSTREAM 0001-Ignore-Cargo.lock.patch -- https://pagure.io/fedora-rust/rust2rpm/c/b5e2db003fe02d689d9e724a1d649d2c6d2919dd?branch=master +Patch0002: 0001-Ignore-Cargo.lock.patch +# PATCH-FIX-UPSTREAM 0001-metadata-replace-semantic-version-with-a-custom-pars.patch -- https://pagure.io/fedora-rust/rust2rpm/c/fcbf95a78efdb310f918363e69706e1a98d93a9f +Patch0003: 0001-metadata-replace-semantic-version-with-a-custom-pars.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch @@ -54,12 +57,10 @@ %if %{with check} BuildRequires: cargo BuildRequires: python3-pytest -BuildRequires: python3-semantic_version %endif Requires: cargo Requires: python3-Jinja2 Requires: python3-requests -Requires: python3-semantic_version Requires: python3-setuptools Requires: python3-tqdm Provides: rust2rpm = %{version}-%{release} ++ 0001-Ignore-Cargo.lock.patch ++ >From b5e2db003fe02d689d9e724a1d649d2c6d2919dd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 18 Aug 2019 16:39:13 +0200 Subject: [PATCH] Ignore Cargo.lock Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/90 Signed-off-by: Igor Gnatenko --- data/macros.cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/macros.cargo b/data/macros.cargo index 1182850..5f60111 100644 --- a/data/macros.cargo +++ b/data/macros.cargo @@ -90,7 +90,7 @@ if %__cargo_is_lib; then \ # so that cargo doesn't fail resolving dependencies:\ # https://github.com/rust-lang/cargo/pull/6729 \ %{__awk} -i inplace -v INPLACE_SUFFIX=.deps '/^\\\[((.+\\\.)?((dev|build)-)?dependencies|features)/{f=1;next} /^\\\[/{f=0}; !f' Cargo.toml \ - %{__cargo} package -l | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \ + %{__cargo} package -l | grep -w -v Cargo.lock | xargs -d '\\\n' %{__cp} --parents -a -t $REG_DIR \ %{__mv} Cargo.toml{.deps,}\ %{__cp} -a Cargo.toml $REG_DIR/Cargo.toml \ %{__rm} -f $REG_DIR/Cargo.toml.{orig,deps}\ -- 2.23.0 ++ 0001-metadata-replace-semantic-version-with-a-custom-pars.patch ++ >From fcbf95a78efdb310f918363e69706e1a98d93a9f Mon Sep 17 00:00:00 2001 From: Alberto Planas Date: Thu, 24 Oct 2019 13:18:55 +0200 Subject: [PATCH] metadata: replace semantic-version with a custom parser The library semantic-version changed a lot during the last versions, making the Metadata class very fragile. A custom-made semantic version parsed, based on some Cargo specifics, has been implemented to replace the old parser. As a result of that, new features were implemented, like the support for wildcard expressions, as documented in the Cargo book. Fix: #93 --- requirements.txt | 1 - rust2rpm/metadata.py | 217 --- setup.py | 3 - test.py | 199 ++- 4 files changed, 360 insertions(
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2019-08-30 14:41:40 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.7948 (New) Package is "rust-packaging" Fri Aug 30 14:41:40 2019 rev:5 rq:727052 version:10 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2019-05-21 10:37:15.715208767 +0200 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.7948/rust-packaging.changes 2019-08-30 14:41:41.957419143 +0200 @@ -1,0 +2,11 @@ +Thu Aug 29 10:13:27 UTC 2019 - Thomas Bechtold + +- update to version 10 + * Translate '-or-later' and '+' license suffixes properly + * Check /usr/lib/os-release in addition to /etc/os-release + * Prettify summary and description automatically + * Use %{expand:…} for %description to avoid escaping of newlines + * Add '--suffix' option for "compat" packages + * Implement option to skip building of crates (aka fast/bootstrap build) + +--- --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2019-05-21 10:37:15.815208702 +0200 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.7948/rust-srpm-macros.changes 2019-08-30 14:41:42.105419128 +0200 @@ -1,0 +2,11 @@ +Thu Aug 29 10:14:50 UTC 2019 - Thomas Bechtold + +- update to version 10 + * Translate '-or-later' and '+' license suffixes properly + * Check /usr/lib/os-release in addition to /etc/os-release + * Prettify summary and description automatically + * Use %{expand:…} for %description to avoid escaping of newlines + * Add '--suffix' option for "compat" packages + * Implement option to skip building of crates (aka fast/bootstrap build) + +--- Old: rust2rpm-9.tar.xz New: rust2rpm-10.tar.xz Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.edZqPj/_old 2019-08-30 14:41:43.121419024 +0200 +++ /var/tmp/diff_new_pack.edZqPj/_new 2019-08-30 14:41:43.125419023 +0200 @@ -1,6 +1,7 @@ # # spec file for package rust-packaging # +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 Red Hat, Inc., Raleigh, North Carolina, United States of America. # Copyright (c) 2017, 2019 Igor Gnatenko . # Copyright (c) 2019 Neal Gompa . @@ -14,17 +15,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %bcond_without check Name: rust-packaging -Version:9 +Version:10 Release:0 Summary:RPM macros for building Rust packages on various architectures -Group: Development/Languages/Rust License:MIT +Group: Development/Languages/Rust URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz # PATCH-FIX-OPENSUSE 0001-macros-Remove-Cargo.toml.orig.patch -- Remove Cargo.toml.orig @@ -34,11 +36,11 @@ ExclusiveArch: %{rust_arches} noarch # gawk is needed for stripping dev-deps in macro, 4.1.0 is needed for inplace feature +Requires: cargo Requires: gawk >= 4.1.0 Requires: python3-rust2rpm = %{version}-%{release} -Requires: rust-srpm-macros = %{version} Requires: rust -Requires: cargo +Requires: rust-srpm-macros = %{version} %description The package provides macros for building projects in Rust @@ -50,15 +52,15 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools %if %{with check} -BuildRequires: python3-pytest BuildRequires: cargo +BuildRequires: python3-pytest BuildRequires: python3-semantic_version %endif Requires: cargo -Requires: python3-semantic_version -Requires: python3-setuptools Requires: python3-Jinja2 Requires: python3-requests +Requires: python3-semantic_version +Requires: python3-setuptools Requires: python3-tqdm Provides: rust2rpm = %{version}-%{release} %{?python_provide:%python_provide python3-rust2rpm} @@ -74,7 +76,6 @@ sed -r -i -e "s|(%\{_bindir\}/cargo-inspector)|env LANG=C.UTF-8 \1|" data/cargo.attr data/macros.cargo sed -i -e '/# Generated by/s/$/-%{version}-%{release}/' rust2rpm/templates/main.spec - %build %py3_build ++ rust-srpm-macros.spec ++ --- /var/tmp/diff_new_pack.edZqPj/_old 2019-08-30 14:41:43.145419021 +0200 +++ /var/tmp/diff_new_pack.edZqPj/_new 2019-08-30 14
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2019-05-21 10:37:15 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.5148 (New) Package is "rust-packaging" Tue May 21 10:37:15 2019 rev:4 rq:700961 version:9 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2019-03-06 15:51:07.988438989 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.5148/rust-packaging.changes 2019-05-21 10:37:15.715208767 +0200 @@ -1,0 +2,51 @@ +Mon May 6 07:19:13 UTC 2019 - Neal Gompa + +- Update to version 9 + + Remove temporary Cargo.toml.deps + + Fix packager identity detection to use fallbacks properly + + Always put upstream license data comment in generated specs +- Drop unneeded epoch handling in spec, as Epochs are nearly never used in openSUSE +- Ensure the version-release of rust2rpm used is mentioned in generated specs +- Ensure license file is installed in rust-packaging + +--- +Tue Apr 23 19:52:40 UTC 2019 - Igor Gnatenko + +- Add 0001-macros-Remove-Cargo.toml.orig.patch so crates pass + rpmlint + +--- +Tue Apr 23 19:27:01 UTC 2019 - Igor Gnatenko + +- Update to version 8 +- Changes since version 6 + * Generate %doc statements for readme from Cargo.toml + * Split features into subpackages (`rust-$crate+$feature-devel`) + * Add support for dependencies with same name + * Add support for user configuration (`.rust2rpm.conf`, `_rust2rpm.conf`) + * Option to not generate default changelog entry (`--no-auto-changelog-entry`) + * Set `CARGO_HOME` to the local `.cargo` (required by new Rust) + * Improvements for crates with pre-release versions + * Do not put unneeded optional dependencies in BuildRequires (`-Z avoid-dev-deps`) + * Option to use all crate features when generating spec file + * Use new-style changelog format (with TZ info) on Fedora + * Option to use dynamic BuildRequires (requires RPM 4.15+) + * Environment variables to control packager identity +- Drop patches part of this release + * 0001-name-spec-patch_file-by-real-crate-name.patch + * 0002-generate-doc-statements.patch + * 0003-do-better-for-renamed-crates.patch + * 0004-remove-pre-3.6-leftovers.patch + * 0005-Remove-half-downloaded-crate-on-C.patch + * 0006-Throw-an-error-if-s-is-used-without-a-crate.patch + * 0007-split-features-into-subpackages.patch + * 0008-add-support-for-dependencies-with-same-name.patch + * 0009-add-support-for-feeding-user-configuration.patch + * 0010-trivial-use-f-strings-everywhere.patch + * 0011-Add-option-to-not-generate-a-default-changelog-entry.patch + * 0012-Set-CARGO_HOME-to-the-local-.config.patch + * 0013-Set-the-install-root-in-.cargo-config.patch + * 0014-Add-support-for-prerelease-versions.patch + + +--- --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2019-03-06 15:51:08.896438826 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.5148/rust-srpm-macros.changes 2019-05-21 10:37:15.815208702 +0200 @@ -1,0 +2,32 @@ +Sun May 5 12:02:04 UTC 2019 - Neal Gompa + +- Update to version 9 + + Remove temporary Cargo.toml.deps + + Fix packager identity detection to use fallbacks properly + + Always put upstream license data comment in generated specs + +--- +Tue Apr 23 19:27:18 UTC 2019 - Igor Gnatenko + +- Update to version 8 + * Pass `-Ccodegen-units=1` in RUSTFLAGS + * Switch to `%{build_rustflags}` +- Changes since version 6 + * Fix `%cargo_install` with crates which use whitespace in files +- Drop patches part of this release + * 0001-name-spec-patch_file-by-real-crate-name.patch + * 0002-generate-doc-statements.patch + * 0003-do-better-for-renamed-crates.patch + * 0004-remove-pre-3.6-leftovers.patch + * 0005-Remove-half-downloaded-crate-on-C.patch + * 0006-Throw-an-error-if-s-is-used-without-a-crate.patch + * 0007-split-features-into-subpackages.patch + * 0008-add-support-for-dependencies-with-same-name.patch + * 0009-add-support-for-feeding-user-configuration.patch + * 0010-trivial-use-f-strings-everywhere.patch + * 0011-Add-option-to-not-generate-a-default-changelog-entry.patch + * 0012-Set-CARGO_HOME-to-the-local-.config.patch + * 0013-Set-the-install-root-in-.cargo-config.patch + * 0014-Add-support-for-prerelease-versions.patch + +--- Old: 0001-name-spec-patch_file-by-real-crate-name.patch 0002-generate-doc-statements.patch 0003-do-better-for-renamed-crates.patch 0004-remove
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2019-03-06 15:50:58 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.28833 (New) Package is "rust-packaging" Wed Mar 6 15:50:58 2019 rev:3 rq:681978 version:6 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2018-11-26 10:19:44.865772286 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.28833/rust-packaging.changes 2019-03-06 15:51:07.988438989 +0100 @@ -1,0 +2,14 @@ +Tue Mar 5 22:40:21 UTC 2019 - Igor Gnatenko + +- Backport more upstream patches + + Added patches +- 0012-Set-CARGO_HOME-to-the-local-.config.patch +- 0013-Set-the-install-root-in-.cargo-config.patch +- 0014-Add-support-for-prerelease-versions.patch +- Replaced patch with upstream version + + Removed patches +- 0101-Add-option-to-not-generate-a-default-changelog-entry.patch + + Added patches +- 0011-Add-option-to-not-generate-a-default-changelog-entry.patch + +--- --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2018-11-26 10:19:44.973772160 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.28833/rust-srpm-macros.changes 2019-03-06 15:51:08.896438826 +0100 @@ -1,0 +2,5 @@ +Tue Mar 5 22:48:39 UTC 2019 - Igor Gnatenko + +- Backport upstream patch for tilde handling + +--- Old: 0101-Add-option-to-not-generate-a-default-changelog-entry.patch New: 0011-Add-option-to-not-generate-a-default-changelog-entry.patch 0012-Set-CARGO_HOME-to-the-local-.config.patch 0013-Set-the-install-root-in-.cargo-config.patch 0014-Add-support-for-prerelease-versions.patch Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.l5MXDI/_old 2019-03-06 15:51:11.664438331 +0100 +++ /var/tmp/diff_new_pack.l5MXDI/_new 2019-03-06 15:51:11.664438331 +0100 @@ -2,7 +2,7 @@ # spec file for package rust-packaging # # Copyright (c) 2017 Red Hat, Inc., Raleigh, North Carolina, United States of America. -# Copyright (c) 2017 Igor Gnatenko . +# Copyright (c) 2017, 2019 Igor Gnatenko . # Copyright (c) 2018 Neal Gompa . # # All modifications and additions to the file contributed by third parties @@ -22,13 +22,11 @@ Name: rust-packaging Version:6 Release:0 -Summary:RPM tools and macros for building Rust packages +Summary:RPM macros for building Rust packages on various architectures Group: Development/Languages/Rust License:MIT URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz - -# Patches from upstream Patch0001: 0001-name-spec-patch_file-by-real-crate-name.patch Patch0002: 0002-generate-doc-statements.patch Patch0003: 0003-do-better-for-renamed-crates.patch @@ -39,9 +37,10 @@ Patch0008: 0008-add-support-for-dependencies-with-same-name.patch Patch0009: 0009-add-support-for-feeding-user-configuration.patch Patch0010: 0010-trivial-use-f-strings-everywhere.patch - -# From: https://pagure.io/fedora-rust/rust2rpm/pull-request/62 -Patch0101: 0101-Add-option-to-not-generate-a-default-changelog-entry.patch +Patch0011: 0011-Add-option-to-not-generate-a-default-changelog-entry.patch +Patch0012: 0012-Set-CARGO_HOME-to-the-local-.config.patch +Patch0013: 0013-Set-the-install-root-in-.cargo-config.patch +Patch0014: 0014-Add-support-for-prerelease-versions.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch @@ -50,9 +49,11 @@ Requires: gawk >= 4.1.0 Requires: python3-rust2rpm = %{?epoch:%{epoch}:}%{version}-%{release} Requires: rust-srpm-macros = %{version} +Requires: rust +Requires: cargo %description -This package provides the tools and macros for building projects in Rust +The package provides macros for building projects in Rust on various architectures. %package -n python3-rust2rpm @@ -70,17 +71,9 @@ Requires: python3-semantic_version Requires: python3-setuptools Requires: python3-rustcfg -%if 0%{?suse_version} Requires: python3-Jinja2 -%else -Requires: python3-jinja2 -%endif Requires: python3-requests Requires: python3-tqdm -%if 0%{?mageia} -Requires: locales-en -%endif -Obsoletes: rust2rpm < 1-8 Provides: rust2rpm = %{version}-%{release} %{?python_provide:%python_provide python3-rust2rpm} @@ -90,18 +83,9 @@ creates packages that comply
commit rust-packaging for openSUSE:Factory
Hello community, here is the log from the commit of package rust-packaging for openSUSE:Factory checked in at 2018-11-26 10:18:33 Comparing /work/SRC/openSUSE:Factory/rust-packaging (Old) and /work/SRC/openSUSE:Factory/.rust-packaging.new.19453 (New) Package is "rust-packaging" Mon Nov 26 10:18:33 2018 rev:2 rq:648268 version:6 Changes: --- /work/SRC/openSUSE:Factory/rust-packaging/rust-packaging.changes 2018-01-22 16:20:50.923394415 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.19453/rust-packaging.changes 2018-11-26 10:19:44.865772286 +0100 @@ -1,0 +2,30 @@ +Sun Nov 11 22:41:29 UTC 2018 - Neal Gompa + +- Update to 6 + + Allow generating spec file from rust project checkout + + add option to copy crate to current working directory + + Filter dependencies using the cfg language +- Backport patches for updated packaging generation + + Added patches +- 0001-name-spec-patch_file-by-real-crate-name.patch +- 0002-generate-doc-statements.patch +- 0003-do-better-for-renamed-crates.patch +- 0004-remove-pre-3.6-leftovers.patch +- 0005-Remove-half-downloaded-crate-on-C.patch +- 0006-Throw-an-error-if-s-is-used-without-a-crate.patch +- 0007-split-features-into-subpackages.patch +- 0008-add-support-for-dependencies-with-same-name.patch +- 0009-add-support-for-feeding-user-configuration.patch +- 0010-trivial-use-f-strings-everywhere.patch +- Remove merged patches + + 0001-macros-remove-Cargo.lock.patch + + 0002-macros-remove-spurious-whitespace.patch +- Add proposed patch to add option to not generate default changelog entry + + 0101-Add-option-to-not-generate-a-default-changelog-entry.patch + +--- +Tue Nov 6 03:02:47 UTC 2018 - Neal Gompa + +- Add missing runtime requirement for python3-setuptools + +--- --- /work/SRC/openSUSE:Factory/rust-packaging/rust-srpm-macros.changes 2018-01-22 16:20:50.955392919 +0100 +++ /work/SRC/openSUSE:Factory/.rust-packaging.new.19453/rust-srpm-macros.changes 2018-11-26 10:19:44.973772160 +0100 @@ -1,0 +2,8 @@ +Sun Nov 11 22:49:16 UTC 2018 - Neal Gompa + +- Update to 6 + + pass %__cargo_common_opts to %cargo_install + + make %cargo_* macros parametric + + remove support for target-dir + +--- Old: 0001-macros-remove-Cargo.lock.patch 0002-macros-remove-spurious-whitespace.patch rust2rpm-5.tar.xz New: 0001-name-spec-patch_file-by-real-crate-name.patch 0002-generate-doc-statements.patch 0003-do-better-for-renamed-crates.patch 0004-remove-pre-3.6-leftovers.patch 0005-Remove-half-downloaded-crate-on-C.patch 0006-Throw-an-error-if-s-is-used-without-a-crate.patch 0007-split-features-into-subpackages.patch 0008-add-support-for-dependencies-with-same-name.patch 0009-add-support-for-feeding-user-configuration.patch 0010-trivial-use-f-strings-everywhere.patch 0101-Add-option-to-not-generate-a-default-changelog-entry.patch rust2rpm-6.tar.xz Other differences: -- ++ rust-packaging.spec ++ --- /var/tmp/diff_new_pack.ypXG2b/_old 2018-11-26 10:19:45.857771127 +0100 +++ /var/tmp/diff_new_pack.ypXG2b/_new 2018-11-26 10:19:45.857771127 +0100 @@ -20,15 +20,28 @@ %bcond_without check Name: rust-packaging -Version:5 +Version:6 Release:0 Summary:RPM tools and macros for building Rust packages Group: Development/Languages/Rust License:MIT URL:https://pagure.io/fedora-rust/rust2rpm Source0: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz -Patch0001: 0001-macros-remove-Cargo.lock.patch -Patch0002: 0002-macros-remove-spurious-whitespace.patch + +# Patches from upstream +Patch0001: 0001-name-spec-patch_file-by-real-crate-name.patch +Patch0002: 0002-generate-doc-statements.patch +Patch0003: 0003-do-better-for-renamed-crates.patch +Patch0004: 0004-remove-pre-3.6-leftovers.patch +Patch0005: 0005-Remove-half-downloaded-crate-on-C.patch +Patch0006: 0006-Throw-an-error-if-s-is-used-without-a-crate.patch +Patch0007: 0007-split-features-into-subpackages.patch +Patch0008: 0008-add-support-for-dependencies-with-same-name.patch +Patch0009: 0009-add-support-for-feeding-user-configuration.patch +Patch0010: 0010-trivial-use-f-strings-everywhere.patch + +# From: https://pagure.io/fedora-rust/rust2rpm/pull-request/62 +Patch0101: 0101-Add-option-to-not-generate-a-default-changelog-entry.patch BuildArch: noarch ExclusiveArch: %{rust_arches} noarch @@ -37,8 +50,6 @@ Requires