Commit graph

317 commits

Author SHA1 Message Date
120d609f58 Fix crash when path to a toml file is given
Fixes a programming error introduced in b284d61ee7, the
variables were not defined.
2021-09-28 13:34:19 +02:00
Zbigniew Jędrzejewski-Szmek
676ad35a1b Merge #137 Files autodetection fixes 2021-09-28 10:42:13 +00:00
7e0afd5da2 fedora: check existing spec file for rpmautospec
If we have a new file: assume yes. If there was an old file, convert
only when the old file had %autochangelog.

The regexp for %autochangelog is taken from
https://pagure.io/fedora-infra/rpmautospec/pull-request/219.
2021-09-20 12:47:37 +02:00
31afa28c74 Simplify assignment
No functional change.
2021-09-20 12:46:13 +02:00
22804aeab0 fedora: use rpmautospec by default
rpmautspec has some shortcomings (e.g. lack of support for multi-line
changelog entries), but those shortcomings are not very important for
rust packages. Let's just use rpmautospec by default for convenience.
2021-09-17 09:40:05 +02:00
Robert-André Mauchin
b284d61ee7 Files autodetection fixes
Do not include subdirectories as %doc. Fix #136.
Sort license and doc files alphabetically. Fix #135.
Only include doc files from the root directory. Fix #134.
2021-07-14 19:57:56 +02:00
f0b940205c
buildsys: release++ 2021-07-12 16:39:43 +02:00
d7b59b3757
rust2rpm: use changelog timestamp without time and timezone on Fedora 2021-07-12 15:32:15 +02:00
f52cbe0232
rust2rpm: add support for using rpmautospec (autorelease + autochangelog) 2021-07-12 15:23:43 +02:00
Robert-André Mauchin
0a91ff0c03 Quick and dirty license and doc files detection
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
2021-03-29 17:28:12 +02:00
Igor Raits
d231e5d433
fedora-helper: Use f35 as a base for license generation
Signed-off-by: Igor Raits <igor.raits@gmail.com>
2021-03-07 21:40:31 +01:00
5ec3227115 licensing: "Python-2.0" is fine in Fedora
The license is listed on fedora's list of "Good" licenses:
https://fedoraproject.org/wiki/Licensing:Main#Good_Licenses.
It is called "Python" and the notes link to
https://docs.python.org/2/license.html.

https://spdx.org/licenses/Python-2.0.html provides the exact same text
as https://docs.python.org/2/license.html. Thus SPDX's "Python-2.0" is
the same as our "Python".

Fixes #121.
2021-02-12 05:11:52 +00:00
ff4c8a62a0 licensing: convert csv to unix eols
The file was originally like that, but the encodings
have become inconsistent through edits anyway. Let's just
change to a normal encoding.
2021-02-12 05:11:52 +00:00
Jan Staněk
035e458f0a
Parse features with + in their name
If a crate has a feature with `+` in it's name,
the `%__cargo_feature_from_name` macro fails to correctly parse it.
For example, the `cxxbridge-flags` crate declares (among others)
the `c++20` feature; that is currently parsed as follows:

```lua
> string.match("cxxbridge-flags+c++20-devel", "^.+%+(.+)-devel$")
20
```

The adjusted regex matches the *first* `+` as feature name separator:

```lua
> string.match("cxxbridge-flags+c++20-devel", "^[^+]+%+(.+)-devel$")
c++20
```
2021-02-01 13:56:37 +01:00
Igor Raits
1a28095971
buildsys: release++
Signed-off-by: Igor Raits <igor.raits@gmail.com>
2020-12-26 12:50:28 +01:00
Igor Raits
94dcd7b71e rust2rpm: Return back printing BuildRequires in %generate_buildrequires
This reverts commit 8e103f6aaf (partially).

Signed-off-by: Igor Raits <igor.raits@gmail.com>
2020-12-26 12:49:15 +01:00
857192c0dd
buildsys: release++ 2020-11-13 13:55:06 +01:00
8e103f6aaf
rust2rpm: allow removing unwanted features
Also, don't "echo" BuildRequires, this is very weird.
2020-11-13 11:04:27 +01:00
44eed8233c
rust2rpm: set User-Agent header to work around new crates.io limits 2020-11-03 18:52:20 +01:00
Javier Martinez Canillas
a0b2e3c799
licensing: Add LGPL-2.1-or-later short identifier as a LGPLv2+ variant
The SPDX license short identifier for "GNU Lesser General Public License
v2.1 or later" is LGPL-2.1-or-later [0]. Add a SPDX to Fedora mapping.

[0]: https://spdx.org/licenses/LGPL-2.1-or-later.html
2020-10-05 12:17:36 +02:00
629bba09f1 Add EUPL-1.2 to license list
https://spdx.org/licenses/EUPL-1.2.html

Discussed in https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/thread/LZQ4SRN6L5JWEDKL23K4CXDG7TJWFTLF/.

Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
2020-08-19 15:21:00 +02:00
Igor Raits
a8c7f5c197
fedora-helper: Rawhide is now f34
Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
2020-08-18 15:05:21 +02:00
Andreas Schwab
8dcf851319 Add riscv64 to %rust_arches
Signed-off-by: Andreas Schwab <schwab@suse.de>
2020-08-13 21:24:06 +02:00
Igor Raits
f74d7a19ae
fedora-helper: Use repo_local for local RPMs
Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
2020-06-19 06:44:13 +02:00
Igor Raits
b09a48a0c1
fedora-helper: Fixup comment
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-30 18:58:12 +02:00
Igor Raits
8fee5adf47
fedora-helper: Do not fail if unlink() fails
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-30 18:43:56 +02:00
Igor Raits
979ccdb601
fedora-helper: Do not create CACHEDIR twice
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-30 18:40:40 +02:00
Igor Raits
fdf954cd36
fedora-helper: Clarify how to generate binary license with dynamic BuildRequires
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-30 18:39:58 +02:00
Igor Raits
d1ee7ed95c
Add tool that helps with maintenance in Fedora
Most likely there are some missing checks for None and the program may
segfault, but this can be fixed in future.

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-30 18:32:28 +02:00
Michel Alexandre Salim
850b1ab5a2 Add mapping for LGPL-3.0-or-later to LGPLv3+
see https://spdx.org/licenses/
2020-05-22 17:09:56 -07:00
Igor Raits
ca9fc7e466
buildsys: release++
Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-22 15:54:31 +02:00
Thomas Jarosch
90d0e85da2
Fix up Cargo.toml.orig error message that started to appear with Rust 1.43.0
+ /usr/bin/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1 /opt/rust/bin/cargo package -l
+ grep -w -v Cargo.lock
+ xargs -d '\n' /bin/cp --parents -a -t /user/rpmbuild/BUILDROOT/rust-term_size-0.3.0-1.i2n.x86_64/datastore/dev/rust/cargo/registry/term_size-0.3.0
warning: No (git) VCS found for `/datastore/rpmbuild/BUILD/term_size-0.3.0`
/bin/cp: cannot stat 'Cargo.toml.orig': No such file or directory

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>
2020-05-02 19:12:54 +02:00
Alberto Planas
aa8f8a1f10 metadata: support versions like X.*.* 2020-02-18 17:50:26 +01:00
Josh Stone
b4581d8f5b 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.
2020-01-30 22:02:59 -08:00
Igor Gnatenko
e671086e38
buildsys: release++
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-20 18:09:46 +01:00
Igor Gnatenko
509c9ca267
metadata: Support "renamed" dependencies
For example,

```toml
[dependencies]
open-ssl = { version="0.10", package = "openssl", optional = true }
[features]
openssl = ["actix-tls/openssl", "awc/openssl", "open-ssl"]
```

would end up previously with just +openssl subpackage with dependency on
crate(openssl). Now we create +open-ssl subpackage with dependency on
crate(openssl) and +openssl subpackage with dependencies on
crate(actix-tls/openssl), crate(awc/openssl) and +open-ssl subpackage.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-20 17:46:55 +01:00
Igor Gnatenko
b2d348bd41
inspector: Add support for multiple features
Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/103
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-16 08:02:47 +01:00
Igor Gnatenko
94e3528e8f
templates: Generate files entry with no-tilde
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-13 22:05:04 +01:00
Igor Gnatenko
d20f990832
buildsys: release++
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-13 21:42:31 +01:00
Igor Gnatenko
150aca7d2a
metadata: Fix setting up tilde version in RPM
Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/101
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-13 21:41:39 +01:00
Igor Gnatenko
c61d9d6879
Revert "metadata: Set tilde separator for rust2rpm.Metadata.version"
This is not full fix, unfortunately since it breaks cargo-inspect. Paths
on the file system are still with `-`.

This reverts commit cfd3150663.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-13 21:17:26 +01:00
Igor Gnatenko
cfd3150663
metadata: Set tilde separator for rust2rpm.Metadata.version
Otherwise we can't really package pre-release versions anymore :/

Fixes: https://pagure.io/fedora-rust/rust2rpm/issue/101
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-13 21:09:58 +01:00
Igor Gnatenko
c5e398bca6
buildsys: release++
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-04 07:56:50 +01:00
Igor Gnatenko
47c75b2078
Add --no-dynamic-buildrequires options
And set Fedora's default behavior is to enable DynamicBuildRequires.

All Fedora crates use dynamic BuildRequires and are built only in
Rawhide and is unlikely that anybody is building hundreds of crates
outside of Fedora infrastructure.

Closes: https://pagure.io/fedora-rust/rust2rpm/issue/97
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-03 19:23:18 +01:00
Igor Gnatenko
a6bde5599a
Pass --cap-lints=warn to the RUSTFLAGS
It is simply impossible to fight against people putting
 #![deny(warnings)] into the code…

Closes: https://pagure.io/fedora-rust/rust2rpm/issue/98
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-12-03 19:11:20 +01:00
dd5bd74495 licensing: add bsd-2-clause-patent
https://fedoraproject.org/wiki/Licensing/BSD-2-Clause-Patent
https://spdx.org/licenses/BSD-2-Clause-Patent
The table is now up-to-date wrt. to
https://fedoraproject.org/wiki/Licensing:Main#SoftwareLicenses.
2019-11-30 14:02:54 +01:00
00570415d4 licensing: add 0BSD
https://www.spinics.net/linux/fedora/fedora-legal/msg03346.html

Fixes #96.
2019-11-30 13:54:20 +01:00
9036039d04 licensing: add MPL-2.0+ as equivalent to MPL-2.0
Permission to use later versions is included in the license, so the
"-or-later" part does not change anything.
https://fedoraproject.org/wiki/Licensing/MPLv2.0 says:
> 10.2. Effect of New Versions
>
> You may distribute the Covered Software under the terms of the version
> of the License under which You originally received the Covered
> Software, or under the terms of any subsequent version published by
> the license steward.

Fixes #88.
2019-11-30 13:48:19 +01:00
Alberto Planas
23e807d8ce metadata: normalize version via CargoSemVer 2019-10-30 17:28:32 +01:00
Alberto Planas
fcbf95a78e 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
2019-10-28 11:19:46 +01:00