decathorpe/rust2rpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

templates: drop unused %crate macro definition from "project" specs

Browse source
This commit is contained in:
Fabio Valentini 2024-03-22 23:33:36 +01:00
parent 54ccda4190
commit 2466b6abc4
No known key found for this signature in database
GPG key ID: 5AC5F572E5D410AF
12 changed files with 6 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
rust2rpm/templates/README.md
View file

@ -164,7 +164,6 @@
| parameter name | type | value |
| ------------------ | --------------- | --------------------------------------------------------- |
| `crate_name` | `str` | crate name (from `Cargo.toml` metadata) |
| `crate_version` | `str` | crate version (from `Cargo.toml` metadata, SemVer format) |
| `crate_license` | `Optional[str]` | crate license (from `Cargo.toml` metadata) |
| `upstream_version` | `str` | upstream crate version (from `crates.io`) |

3
rust2rpm/templates/crate.spec
View file

@ -27,8 +27,7 @@
%global crate {{ crate_name }}
{% if crate_version != rpm_version %}
%global crate_version {{ crate_version }}
{% endif %}
{% if crate_version != upstream_version %}
{% elif crate_version != upstream_version %}
%global upstream_version {{ upstream_version }}
{% endif %}
{% if conf_supported_arches %}

7
rust2rpm/templates/project.spec
View file

@ -13,12 +13,11 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate {{ crate_name }}
{% if crate_version != rpm_version %}
%global crate_version {{ crate_version }}
{% endif %}
{% if crate_version != upstream_version %}
{% elif crate_version != upstream_version %}
%global upstream_version {{ upstream_version }}
{% endif %}

3
rust2rpm/templates/workspace.spec
View file

@ -10,10 +10,11 @@
{% endif %}
%bcond_with check
{% endif %}
{% if rpm_version != upstream_version %}
%global upstream_version {{ upstream_version }}
{% endif %}
Name: {{ rpm_name }}
Version: {{ rpm_version }}
Release: {{ rpm_release }}

2
rust2rpm/tests/samples/rust2rpm-helper-0.1.3.fedora.spec
View file

@ -4,8 +4,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate rust2rpm-helper
Name: rust2rpm-helper
Version: 0.1.3
Release: %autorelease

2
rust2rpm/tests/samples/rust2rpm-helper-0.1.3.mageia.spec
View file

@ -4,8 +4,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate rust2rpm-helper
Name: rust2rpm-helper
Version: 0.1.3
Release: %mkrel 1

2
rust2rpm/tests/samples/rust2rpm-helper-0.1.3.opensuse.spec
View file

@ -21,8 +21,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate rust2rpm-helper
Name: rust2rpm-helper
Version: 0.1.3
Release: 0

2
rust2rpm/tests/samples/rust2rpm-helper-0.1.3.plain.spec
View file

@ -4,8 +4,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate rust2rpm-helper
Name: rust2rpm-helper
Version: 0.1.3
Release: 1%{?dist}

2
rust2rpm/tests/samples/stgit-2.3.3.fedora.spec
View file

@ -4,8 +4,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate stgit
Name: stgit
Version: 2.3.3
Release: %autorelease

2
rust2rpm/tests/samples/stgit-2.3.3.mageia.spec
View file

@ -4,8 +4,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate stgit
Name: stgit
Version: 2.3.3
Release: %mkrel 1

2
rust2rpm/tests/samples/stgit-2.3.3.opensuse.spec
View file

@ -21,8 +21,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate stgit
Name: stgit
Version: 2.3.3
Release: 0

2
rust2rpm/tests/samples/stgit-2.3.3.plain.spec
View file

@ -4,8 +4,6 @@
# prevent library files from being installed
%global cargo_install_lib 0
%global crate stgit
Name: stgit
Version: 2.3.3
Release: 1%{?dist}