diff --git a/.gitignore b/.gitignore index 01e1287..5b8a418 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /phf_macros-0.8.0.crate /phf_macros-0.10.0.crate +/phf_macros-0.11.2.crate diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..cd5bf68 --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2014-2022 Steven Fackler, Yuki Okushi + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 40c3813..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# rust-phf_macros - -The rust-phf_macros package \ No newline at end of file diff --git a/rust-phf_macros.spec b/rust-phf_macros.spec index d055305..6592eda 100644 --- a/rust-phf_macros.spec +++ b/rust-phf_macros.spec @@ -1,24 +1,21 @@ -# Generated by rust2rpm 20 -# * Circular dependency with old phf -%bcond_with check +# Generated by rust2rpm 24 +%bcond_without check %global debug_package %{nil} %global crate phf_macros -Name: rust-%{crate} -Version: 0.10.0 +Name: rust-phf_macros +Version: 0.11.2 Release: %autorelease Summary: Macros to generate types in the phf crate -# Upstream license specification: MIT -# https://github.com/sfackler/rust-phf/pull/118 License: MIT URL: https://crates.io/crates/phf_macros -Source: %{crates_source} +Source0: %{crates_source} +# https://github.com/rust-phf/rust-phf/pull/293 +Source1: https://github.com/rust-phf/rust-phf/raw/phf_macros-v0.11.1/LICENSE -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: rust-packaging >= 21 %global _description %{expand: Macros to generate types in the phf crate.} @@ -35,7 +32,9 @@ This package contains library source intended for building other packages which use the "%{crate}" crate. %files devel -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license LICENSE +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -47,7 +46,7 @@ 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}+unicase-devel Summary: %{summary} @@ -59,7 +58,7 @@ This package contains library source intended for building other packages which use the "unicase" feature of the "%{crate}" crate. %files -n %{name}+unicase-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+unicase_-devel Summary: %{summary} @@ -71,11 +70,12 @@ This package contains library source intended for building other packages which use the "unicase_" feature of the "%{crate}" crate. %files -n %{name}+unicase_-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +cp -pav %{SOURCE1} . %generate_buildrequires %cargo_generate_buildrequires diff --git a/sources b/sources index 48ef7b3..e4097a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phf_macros-0.10.0.crate) = edb5022e5735c5f6f78cd7774575049bc5fabe1cb444c97654135ef8cd90fc06c3f9ed94c1c0d8741f47888857e6b890ae27bb5ceb37c996cbaa90c7ddcb464a +SHA512 (phf_macros-0.11.2.crate) = ea6acfc43491af1330d32860103ad60f29566f6c32d43bbef254f23da0f17cc3723b1d04153fa41f82c01d3865e0e16156b9d2dcbe6a52532b8f268f3a55df7c