diff --git a/rust-onig_sys.spec b/rust-onig_sys.spec index 01d23b2..483fa9e 100644 --- a/rust-onig_sys.spec +++ b/rust-onig_sys.spec @@ -1,42 +1,44 @@ -# Generated by rust2rpm -# * Tests are run in infrastructure -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate onig_sys Name: rust-%{crate} Version: 69.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Raw rust bindings to the oniguruma library -License: MIT +# Upstream license specification: MIT +# * Since we bundle oniguruma for time being, it is BSD +License: MIT and BSD URL: https://crates.io/crates/onig_sys -Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source: %{crates_source} # Use system onig by default -Patch0: rust-onig_sys-use-system-onig.diff +# * This is utterly broken with 6.9.2, https://github.com/rust-onig/rust-onig/issues/103 +#Patch0: rust-onig_sys-use-system-onig.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(cc/default) >= 1.0.0 with crate(cc/default) < 2.0.0) -BuildRequires: (crate(pkg-config/default) >= 0.3.0 with crate(pkg-config/default) < 0.4.0) -BuildRequires: pkgconfig(oniguruma) >= 6.8.0 - -%global _description \ -The `onig_sys` crate contains raw rust bindings to the oniguruma library.\ -This crate exposes a set of unsafe functions which can then\ -be used by other crates to create safe wrappers around Oniguruma.\ -\ -You probably don't want to link to this crate directly;\ -instead check out the `onig` crate. + +%global _description %{expand: +`onig_sys` crate contains raw rust bindings to the oniguruma library. This +crate exposes a set of unsafe functions which can then be used by other crates +to create safe wrappers around Oniguruma. +You probably don't want to link to +this crate directly; instead check out the `onig` crate.} %description %{_description} %package devel Summary: %{summary} BuildArch: noarch -Requires: pkgconfig(oniguruma) >= 6.8.0 +#Requires: pkgconfig(oniguruma) >= 6.8.0 +Provides: bundled(oniguruma) = 6.9.1 %description devel %{_description} @@ -84,10 +86,15 @@ which use "print-debug" feature of "%{crate}" crate. %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml %prep -%autosetup -n %{crate}-%{version} -p1 -rm -vrf oniguruma/ +%autosetup -n %{crate}-%{version_no_tilde} -p1 +#rm -vrf oniguruma/ +find oniguruma/ -type f -executable -exec chmod -x {} \+ %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires +#echo 'pkgconfig(oniguruma) >= 6.8.0' + %build %cargo_build @@ -100,6 +107,9 @@ rm -vrf oniguruma/ %endif %changelog +* Sun Jun 23 00:12:31 CEST 2019 Igor Gnatenko - 69.1.0-3 +- Regenerate + * Sat Feb 02 2019 Fedora Release Engineering - 69.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild