From d6a6649c740a2a829d019824f5fe252f55d4d716 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 5 Feb 2023 14:41:36 +0100 Subject: [PATCH] Drop binary which is only useful for upstream development --- peg-macros-fix-metadata.diff | 14 ++++++++++ rust-peg-macros.spec | 50 +++++++++++++++--------------------- 2 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 peg-macros-fix-metadata.diff diff --git a/peg-macros-fix-metadata.diff b/peg-macros-fix-metadata.diff new file mode 100644 index 0000000..4440e67 --- /dev/null +++ b/peg-macros-fix-metadata.diff @@ -0,0 +1,14 @@ +--- peg-macros-0.6.3/Cargo.toml 2020-07-22T03:04:04+00:00 ++++ peg-macros-0.6.3/Cargo.toml 2023-02-05T13:40:13.088140+00:00 +@@ -24,11 +24,6 @@ + path = "lib.rs" + proc-macro = true + +-[[bin]] +-name = "rust-peg" +-path = "bin.rs" +-test = false +-bench = false + [dependencies.peg-runtime] + version = "= 0.6.3" + diff --git a/rust-peg-macros.spec b/rust-peg-macros.spec index 3f3964a..f2b710d 100644 --- a/rust-peg-macros.spec +++ b/rust-peg-macros.spec @@ -1,53 +1,40 @@ -# Generated by rust2rpm 13 +# Generated by rust2rpm 23 %bcond_without check +%global debug_package %{nil} %global crate peg-macros -Name: rust-%{crate} +Name: rust-peg-macros Version: 0.6.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Procedural macros for rust-peg -# Upstream license specification: MIT # https://github.com/kevinmehall/rust-peg/pull/241 License: MIT URL: https://crates.io/crates/peg-macros Source: %{crates_source} +# Manually created patch for downstream crate metadata changes +# * drop binary which is only useful for upstream development +Patch: peg-macros-fix-metadata.diff -ExclusiveArch: %{rust_arches} -%if %{__cargo_skip_build} -BuildArch: noarch -%endif - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Procedural macros for rust-peg. To use rust-peg, see the `peg` crate.} %description %{_description} -%if ! %{__cargo_skip_build} -# /usr/bin/rust-peg used to be shipped as "peg" with the "rust-peg" package -%package -n peg -Summary: %{summary} - -%description -n peg %{_description} - -%files -n peg -%{_bindir}/rust-peg -%endif - %package devel Summary: %{summary} BuildArch: noarch %description devel %{_description} -This package contains library source intended for building other packages -which use "%{crate}" crate. +This package contains library source intended for building other packages which +use the "%{crate}" crate. %files devel -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -55,11 +42,11 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} -This package contains library source intended for building other packages -which use "default" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+trace-devel Summary: %{summary} @@ -67,11 +54,11 @@ BuildArch: noarch %description -n %{name}+trace-devel %{_description} -This package contains library source intended for building other packages -which use "trace" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "trace" feature of the "%{crate}" crate. %files -n %{name}+trace-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 @@ -92,6 +79,9 @@ which use "trace" feature of "%{crate}" crate. %endif %changelog +* Sun Feb 05 2023 Fabio Valentini - 0.6.3-7 +- Drop binary which is only useful for upstream development. + * Sat Jan 21 2023 Fedora Release Engineering - 0.6.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild