From 5137d7f06b9b7dd420ccf091f91fa51f40ea155a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 20 Jun 2019 12:42:30 +0200 Subject: [PATCH] Update to 0.4.19 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + curl-sys-fix-metadata.diff | 13 ++++++------- rust-curl-sys.spec | 28 +++++++++++++++------------- sources | 2 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 6d0f0dd..8ca62a3 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /curl-sys-0.4.16.crate /curl-sys-0.4.17.crate /curl-sys-0.4.18.crate +/curl-sys-0.4.19.crate diff --git a/curl-sys-fix-metadata.diff b/curl-sys-fix-metadata.diff index c633428..af4d821 100644 --- a/curl-sys-fix-metadata.diff +++ b/curl-sys-fix-metadata.diff @@ -1,5 +1,5 @@ ---- curl-sys-0.4.18/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ curl-sys-0.4.18/Cargo.toml 2019-05-09T19:03:08.866555+00:00 +--- curl-sys-0.4.19/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ curl-sys-0.4.19/Cargo.toml 2019-06-20T10:41:35.788211+00:00 @@ -28,10 +28,6 @@ [dependencies.libc] version = "0.2.2" @@ -11,17 +11,16 @@ [dependencies.libz-sys] version = "1.0.18" [build-dependencies.cc] -@@ -42,20 +38,12 @@ - +@@ -43,7 +39,7 @@ [features] default = ["ssl"] --force-system-lib-on-osx = [] + force-system-lib-on-osx = [] -http2 = ["libnghttp2-sys"] +http2 = [] spnego = [] ssl = ["openssl-sys"] --static-curl = [] --static-ssl = ["openssl-sys/vendored"] + static-curl = [] +@@ -51,11 +47,6 @@ [target."cfg(all(unix, not(target_os = \"macos\")))".dependencies.openssl-sys] version = "0.9" optional = true diff --git a/rust-curl-sys.spec b/rust-curl-sys.spec index 064200a..9de0a0f 100644 --- a/rust-curl-sys.spec +++ b/rust-curl-sys.spec @@ -1,12 +1,11 @@ -# Generated by rust2rpm-9-1.fc30 -# * Tests are run in infrastructure -%bcond_with check +# Generated by rust2rpm 10 +%bcond_without check %global debug_package %{nil} %global crate curl-sys Name: rust-%{crate} -Version: 0.4.18 +Version: 0.4.19 Release: 1%{?dist} Summary: Native bindings to the libcurl library @@ -16,23 +15,19 @@ URL: https://crates.io/crates/curl-sys Source: %{crates_source} # Initial patched metadata # * No windows -# * No "static" features # * libnghttp2-sys is only needed for bundled curl Patch0: curl-sys-fix-metadata.diff Patch1: curl-sys-remove-libnghttp2-sys.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(libc/default) >= 0.2.2 with crate(libc/default) < 0.3.0) -BuildRequires: (crate(libz-sys/default) >= 1.0.18 with crate(libz-sys/default) < 2.0.0) -BuildRequires: (crate(openssl-sys/default) >= 0.9.0 with crate(openssl-sys/default) < 0.10.0) -BuildRequires: (crate(pkg-config/default) >= 0.3.3 with crate(pkg-config/default) < 0.4.0) -BuildRequires: pkgconfig(libcurl) -%global _description \ -Native bindings to the libcurl library. +%global _description %{expand: +Native bindings to the libcurl library.} %description %{_description} @@ -116,6 +111,10 @@ which use "ssl" feature of "%{crate}" crate. rm -vrf curl %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires +echo 'pkgconfig(libcurl)' + %build %cargo_build @@ -128,6 +127,9 @@ rm -vrf curl %endif %changelog +* Thu Jun 20 12:41:37 CEST 2019 Igor Gnatenko - 0.4.19-1 +- Update to 0.4.19 + * Thu May 09 2019 Josh Stone - 0.4.18-1 - Update to 0.4.18 diff --git a/sources b/sources index 3d89a24..85e71ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-sys-0.4.18.crate) = b4f4afa8ce8c9390de02a286b5d1663d8d8ad45026da5b4ea1a3059b812edc67d292db2f628c167c2e633c03784032ce650580e8460fafaa8a6fa5587041d163 +SHA512 (curl-sys-0.4.19.crate) = b7e20e92d4cbe52dbd4c99d65d2421caac2fc50140a0c839a7a38df168a15cb2d1a509195badca722a57ef96e6f8b95d3cce2a8df0f5f1ad3e4afff2f520210f