diff --git a/.gitignore b/.gitignore index 1ca6bb3..1fa667d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /rust2rpm-10.tar.xz /rust2rpm-11.tar.xz /rust2rpm-12.tar.xz +/rust2rpm-13.tar.xz diff --git a/0001-templates-Generate-files-entry-with-no-tilde.patch b/0001-templates-Generate-files-entry-with-no-tilde.patch deleted file mode 100644 index 30040e9..0000000 --- a/0001-templates-Generate-files-entry-with-no-tilde.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 94e3528e8f142e09c476417e43bf2597e029590d Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Fri, 13 Dec 2019 22:05:04 +0100 -Subject: [PATCH] templates: Generate files entry with no-tilde - -Signed-off-by: Igor Gnatenko ---- - rust2rpm/templates/main.spec | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rust2rpm/templates/main.spec b/rust2rpm/templates/main.spec -index 2fb1aff..c5686d3 100644 ---- a/rust2rpm/templates/main.spec -+++ b/rust2rpm/templates/main.spec -@@ -170,9 +170,9 @@ which use {% if feature is not none %}"{{ feature }}" feature of {% endif %}"%{c - {% if md.readme is not none %} - %doc {{ md.readme }} - {% endif %} --%{cargo_registry}/%{crate}-%{version}/ -+%{cargo_registry}/%{crate}-%{version_no_tilde}/ - {% else %} --%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml -+%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml - {% endif %} - - {% endfor %} --- -2.24.1 - diff --git a/rust-packaging.spec b/rust-packaging.spec index c10be97..1b320fb 100644 --- a/rust-packaging.spec +++ b/rust-packaging.spec @@ -3,14 +3,13 @@ %global debug_package %{nil} Name: rust-packaging -Version: 12 -Release: 2%{?dist} +Version: 13 +Release: 1%{?dist} Summary: RPM macros for building Rust packages on various architectures License: MIT URL: https://pagure.io/fedora-rust/rust2rpm Source: https://releases.pagure.org/fedora-rust/rust2rpm/rust2rpm-%{version}.tar.xz -Patch0001: 0001-templates-Generate-files-entry-with-no-tilde.patch ExclusiveArch: %{rust_arches} @@ -70,6 +69,9 @@ py.test-%{python3_version} -vv test.py %{python3_sitelib}/rust2rpm/ %changelog +* Fri Dec 20 2019 Igor Gnatenko - 13-1 +- Update to 13 + * Fri Dec 13 2019 Igor Gnatenko - 12-2 - Fixup generation of files with no-tilde diff --git a/sources b/sources index a171058..ab8f1d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rust2rpm-12.tar.xz) = efef036c1457d194ce0b0379638419dc9aae017ed652d6a1ad51a345728f28d73389bbdcf41a56fae2201c199d04bbe95071abd639dcecb750ea7de8e9b8450c +SHA512 (rust2rpm-13.tar.xz) = 48eb5eb5fa574b9c0df8b4feac963e873c15ed4f347023326e0809bff6afbd2c3ad9848e43e678d7bc4314c2f2231dbac8ddacb70d1370c134e3597e2b8f7cfc