From de85f368870dac0d0f6d9969aa3f6344c7102f7a Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Fri, 22 Nov 2019 16:07:01 -0800 Subject: [PATCH] Update to 0.28.1 --- .gitignore | 1 + 0001-chore-Update-glob-to-0.3.patch | 35 ----------------------------- clang-sys-fix-metadata.diff | 20 ++++------------- rust-clang-sys.spec | 26 ++++++++++++--------- sources | 2 +- 5 files changed, 21 insertions(+), 63 deletions(-) delete mode 100644 0001-chore-Update-glob-to-0.3.patch diff --git a/.gitignore b/.gitignore index 5d6fb7f..0f7e1c3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /clang-sys-0.26.4.crate /clang-sys-0.27.0.crate /clang-sys-0.28.0.crate +/clang-sys-0.28.1.crate diff --git a/0001-chore-Update-glob-to-0.3.patch b/0001-chore-Update-glob-to-0.3.patch deleted file mode 100644 index c4ffbfb..0000000 --- a/0001-chore-Update-glob-to-0.3.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7a6a33fc6290dbb712f6c2682f6054ec467d718d Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Tue, 7 May 2019 14:06:40 +0200 -Subject: [PATCH] chore: Update glob to 0.3 - -Signed-off-by: Igor Gnatenko ---- - build/common.rs | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/build/common.rs b/build/common.rs -index 44e58e0..ed69d4b 100644 ---- a/build/common.rs -+++ b/build/common.rs -@@ -77,7 +77,7 @@ fn search_directory(directory: &Path, filenames: &[String]) -> Vec<(PathBuf, Str - options.require_literal_separator = true; - - paths.flat_map(|p| { -- if let Ok(paths) = glob::glob_with(&p, &options) { -+ if let Ok(paths) = glob::glob_with(&p, options) { - paths.filter_map(Result::ok).collect() - } else { - vec![] -@@ -155,7 +155,7 @@ pub fn search_libclang_directories(files: &[String], variable: &str) -> Vec<(Pat - options.case_sensitive = false; - options.require_literal_separator = true; - for directory in directories.iter().rev() { -- if let Ok(directories) = glob::glob_with(directory, &options) { -+ if let Ok(directories) = glob::glob_with(directory, options) { - for directory in directories.filter_map(Result::ok).filter(|p| p.is_dir()) { - found.extend(search_directories(&directory, files)); - } --- -2.21.0 - diff --git a/clang-sys-fix-metadata.diff b/clang-sys-fix-metadata.diff index 232dcf3..35ee3ce 100644 --- a/clang-sys-fix-metadata.diff +++ b/clang-sys-fix-metadata.diff @@ -1,22 +1,10 @@ ---- clang-sys-0.28.0/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ clang-sys-0.28.0/Cargo.toml 2019-05-07T12:25:04.096136+00:00 -@@ -21,8 +21,9 @@ +--- clang-sys-0.28.1/Cargo.toml 1970-01-01T00:00:00+00:00 ++++ clang-sys-0.28.1/Cargo.toml 2019-11-23T00:05:36.674266+00:00 +@@ -21,6 +21,7 @@ readme = "README.md" license = "Apache-2.0" repository = "https://github.com/KyleMayes/clang-sys" +exclude = ["/appveyor.yml", "/ci/*", "/clippy.toml"] [dependencies.glob] --version = "0.2.11" -+version = "0.3" + version = "0.3" - [dependencies.libc] - version = "0.2.39" -@@ -32,7 +33,7 @@ - version = "0.5.0" - optional = true - [build-dependencies.glob] --version = "0.2.11" -+version = "0.3" - - [features] - clang_3_5 = [] diff --git a/rust-clang-sys.spec b/rust-clang-sys.spec index 4b688ac..eb1a2f1 100644 --- a/rust-clang-sys.spec +++ b/rust-clang-sys.spec @@ -1,12 +1,12 @@ -# Generated by rust2rpm-9-1.fc31 +# Generated by rust2rpm 10 %bcond_with check %global debug_package %{nil} %global crate clang-sys Name: rust-%{crate} -Version: 0.28.0 -Release: 3%{?dist} +Version: 0.28.1 +Release: 1%{?dist} Summary: Rust bindings for libclang # Upstream license specification: Apache-2.0 @@ -15,20 +15,17 @@ URL: https://crates.io/crates/clang-sys Source: %{crates_source} # Initial patched metadata # * Exclude unneeded files -# * Update glob to 0.3, https://github.com/KyleMayes/clang-sys/pull/90 Patch0: clang-sys-fix-metadata.diff -# Make it work with new glob -Patch1: 0001-chore-Update-glob-to-0.3.patch ExclusiveArch: %{rust_arches} +%if %{__cargo_skip_build} +BuildArch: noarch +%endif BuildRequires: rust-packaging -BuildRequires: (crate(glob/default) >= 0.3.0 with crate(glob/default) < 0.4.0) -BuildRequires: (crate(libc) >= 0.2.39 with crate(libc) < 0.3.0) -BuildRequires: clang-devel >= 3.5 -%global _description \ -Rust bindings for libclang. +%global _description %{expand: +Rust bindings for libclang.} %description %{_description} @@ -337,6 +334,10 @@ which use "static" feature of "%{crate}" crate. %autosetup -n %{crate}-%{version_no_tilde} -p1 %cargo_prep +%generate_buildrequires +%cargo_generate_buildrequires +echo 'clang-devel >= 3.5' + %build %cargo_build @@ -349,6 +350,9 @@ which use "static" feature of "%{crate}" crate. %endif %changelog +* Sat Nov 23 2019 Josh Stone - 0.28.1-1 +- Update to 0.28.1 + * Fri Jul 26 2019 Fedora Release Engineering - 0.28.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 50d555a..62bf4f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clang-sys-0.28.0.crate) = f55b5dc0aa595619e59f456970621c115aa629d9550b1e2d62c45d8c29f16e66b540b41fcc2bdb8160ead0272c73bd1cb0eb2a7d911f91737f95647d889a4fec +SHA512 (clang-sys-0.28.1.crate) = 56818d67a45e807e651ce2426b61b8c5e026087d5709cc0cfbef26eb162177746ecb13bf07126615bf41ce0b95b515a5e29aad3b65058f714d37979fe6582a98