From 7002544bbb45d92a46c2d9d5872afbc03b566cd5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Jun 22 2019 21:11:05 +0000 Subject: Regenerate Signed-off-by: Igor Gnatenko --- diff --git a/rust-trust-dns-resolver.spec b/rust-trust-dns-resolver.spec index 9a84783..a448ea7 100644 --- a/rust-trust-dns-resolver.spec +++ b/rust-trust-dns-resolver.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 9 +# Generated by rust2rpm 10 # * Tests are missing files %bcond_with check %global debug_package %{nil} @@ -7,7 +7,7 @@ Name: rust-%{crate} Version: 0.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Trust-DNS is a safe and secure DNS library # Upstream license specification: MIT/Apache-2.0 @@ -16,30 +16,15 @@ License: MIT or ASL 2.0 URL: https://crates.io/crates/trust-dns-resolver Source: %{crates_source} # Initial patched metadata -# * No ring and rustls # * No windows Patch0: trust-dns-resolver-fix-metadata.diff ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(cfg-if/default) >= 0.1.0 with crate(cfg-if/default) < 0.2.0) -BuildRequires: (crate(failure/default) >= 0.1.0 with crate(failure/default) < 0.2.0) -BuildRequires: (crate(futures/default) >= 0.1.27 with crate(futures/default) < 0.2.0) -BuildRequires: (crate(lazy_static/default) >= 1.0.0 with crate(lazy_static/default) < 2.0.0) -BuildRequires: (crate(log/default) >= 0.4.1 with crate(log/default) < 0.5.0) -BuildRequires: (crate(lru-cache/default) >= 0.1.2 with crate(lru-cache/default) < 0.2.0) -BuildRequires: (crate(resolv-conf/default) >= 0.6.0 with crate(resolv-conf/default) < 0.7.0) -BuildRequires: (crate(resolv-conf/system) >= 0.6.0 with crate(resolv-conf/system) < 0.7.0) -BuildRequires: (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0) -BuildRequires: (crate(tokio-executor/default) >= 0.1.7 with crate(tokio-executor/default) < 0.2.0) -BuildRequires: (crate(tokio/default) >= 0.1.15 with crate(tokio/default) < 0.2.0) -BuildRequires: (crate(trust-dns-proto/default) >= 0.7.3 with crate(trust-dns-proto/default) < 0.8.0) -%if %{with check} -BuildRequires: (crate(env_logger/default) >= 0.6.0 with crate(env_logger/default) < 0.7.0) -BuildRequires: (crate(tokio-io/default) >= 0.1.0 with crate(tokio-io/default) < 0.2.0) -BuildRequires: (crate(tokio/default) >= 0.1.15 with crate(tokio/default) < 0.2.0) -%endif %global _description %{expand: Trust-DNS is a safe and secure DNS library. This Resolver library uses the @@ -75,6 +60,30 @@ which use "default" feature of "%{crate}" crate. %files -n %{name}+default-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+dns-over-https-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-https-devel %{_description} + +This package contains library source intended for building other packages +which use "dns-over-https" feature of "%{crate}" crate. + +%files -n %{name}+dns-over-https-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+dns-over-https-rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-https-rustls-devel %{_description} + +This package contains library source intended for building other packages +which use "dns-over-https-rustls" feature of "%{crate}" crate. + +%files -n %{name}+dns-over-https-rustls-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+dns-over-native-tls-devel Summary: %{summary} BuildArch: noarch @@ -99,6 +108,18 @@ which use "dns-over-openssl" feature of "%{crate}" crate. %files -n %{name}+dns-over-openssl-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+dns-over-rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dns-over-rustls-devel %{_description} + +This package contains library source intended for building other packages +which use "dns-over-rustls" feature of "%{crate}" crate. + +%files -n %{name}+dns-over-rustls-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+dns-over-tls-devel Summary: %{summary} BuildArch: noarch @@ -135,6 +156,18 @@ which use "dnssec-openssl" feature of "%{crate}" crate. %files -n %{name}+dnssec-openssl-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+dnssec-ring-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+dnssec-ring-devel %{_description} + +This package contains library source intended for building other packages +which use "dnssec-ring" feature of "%{crate}" crate. + +%files -n %{name}+dnssec-ring-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+mdns-devel Summary: %{summary} BuildArch: noarch @@ -147,6 +180,18 @@ which use "mdns" feature of "%{crate}" crate. %files -n %{name}+mdns-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+rustls-devel %{_description} + +This package contains library source intended for building other packages +which use "rustls" feature of "%{crate}" crate. + +%files -n %{name}+rustls-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+serde-devel Summary: %{summary} BuildArch: noarch @@ -183,6 +228,18 @@ which use "tokio" feature of "%{crate}" crate. %files -n %{name}+tokio-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+trust-dns-https-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+trust-dns-https-devel %{_description} + +This package contains library source intended for building other packages +which use "trust-dns-https" feature of "%{crate}" crate. + +%files -n %{name}+trust-dns-https-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %package -n %{name}+trust-dns-native-tls-devel Summary: %{summary} BuildArch: noarch @@ -207,10 +264,37 @@ which use "trust-dns-openssl" feature of "%{crate}" crate. %files -n %{name}+trust-dns-openssl-devel %ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml +%package -n %{name}+trust-dns-rustls-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+trust-dns-rustls-devel %{_description} + +This package contains library source intended for building other packages +which use "trust-dns-rustls" feature of "%{crate}" crate. + +%files -n %{name}+trust-dns-rustls-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + +%package -n %{name}+webpki-roots-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+webpki-roots-devel %{_description} + +This package contains library source intended for building other packages +which use "webpki-roots" feature of "%{crate}" crate. + +%files -n %{name}+webpki-roots-devel +%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml + %prep %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires + %build %cargo_build @@ -223,5 +307,8 @@ which use "trust-dns-openssl" feature of "%{crate}" crate. %endif %changelog +* Sat Jun 22 23:10:02 CEST 2019 Igor Gnatenko - 0.11.1-2 +- Regenerate + * Fri May 31 08:48:00 CEST 2019 Igor Gnatenko - 0.11.1-1 - Initial package diff --git a/trust-dns-resolver-fix-metadata.diff b/trust-dns-resolver-fix-metadata.diff index 8b70a2f..75ef203 100644 --- a/trust-dns-resolver-fix-metadata.diff +++ b/trust-dns-resolver-fix-metadata.diff @@ -1,54 +1,7 @@ --- trust-dns-resolver-0.11.1/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ trust-dns-resolver-0.11.1/Cargo.toml 2019-05-31T06:48:00.781320+00:00 -@@ -48,10 +48,6 @@ - version = "0.6.0" - features = ["system"] - --[dependencies.rustls] --version = "0.15" --optional = true -- - [dependencies.serde] - version = "1.0" - features = ["derive"] -@@ -67,10 +63,6 @@ - [dependencies.tokio-executor] - version = "^0.1.7" - --[dependencies.trust-dns-https] --version = "0.3.0" --optional = true -- - [dependencies.trust-dns-native-tls] - version = "0.6.0" - optional = true -@@ -82,13 +74,6 @@ - [dependencies.trust-dns-proto] - version = "0.7.3" - --[dependencies.trust-dns-rustls] --version = "0.6.0" --optional = true -- --[dependencies.webpki-roots] --version = "^0.16" --optional = true - [dev-dependencies.env_logger] - version = "^0.6" - -@@ -100,19 +85,13 @@ - - [features] - default = ["tokio"] --dns-over-https = [] --dns-over-https-rustls = ["trust-dns-https", "dns-over-rustls", "dns-over-https"] - dns-over-native-tls = ["dns-over-tls", "trust-dns-native-tls"] - dns-over-openssl = ["dns-over-tls", "trust-dns-openssl"] --dns-over-rustls = ["dns-over-tls", "rustls", "trust-dns-rustls", "webpki-roots"] - dns-over-tls = [] - dnssec = [] - dnssec-openssl = ["dnssec", "trust-dns-proto/dnssec-openssl"] --dnssec-ring = ["dnssec", "trust-dns-proto/dnssec-ring"] ++++ trust-dns-resolver-0.11.1/Cargo.toml 2019-06-22T21:10:01.966842+00:00 +@@ -111,8 +111,6 @@ + dnssec-ring = ["dnssec", "trust-dns-proto/dnssec-ring"] mdns = ["trust-dns-proto/mdns"] serde-config = ["serde", "trust-dns-proto/serde-config"] -[target."cfg(windows)".dependencies.ipconfig]