From 1a7430b34aeef2983e86a68d349c47157645a1fd8a5911e2a6384f2b13dad885 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 16 Dec 2020 19:34:59 +0000 Subject: [PATCH] Accepting request 842391 from home:gladiac:branches:devel:languages:rust - Update to version 0.6.15 * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.15 * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.14 - Removed 123.patch OBS-URL: https://build.opensuse.org/request/show/842391 OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/cargo-c?expand=0&rev=14 --- 123.patch | 66 ------------------------------------------- cargo-c-0.6.13.tar.gz | 3 -- cargo-c-0.6.15.tar.gz | 3 ++ cargo-c.changes | 8 ++++++ cargo-c.spec | 4 +-- vendor.tar.xz | 4 +-- 6 files changed, 14 insertions(+), 74 deletions(-) delete mode 100644 123.patch delete mode 100644 cargo-c-0.6.13.tar.gz create mode 100644 cargo-c-0.6.15.tar.gz diff --git a/123.patch b/123.patch deleted file mode 100644 index d131719..0000000 --- a/123.patch +++ /dev/null @@ -1,66 +0,0 @@ -From f3df5af26c9b8a13e2beedb7de688d9b08861513 Mon Sep 17 00:00:00 2001 -From: Luca Barbato -Date: Tue, 13 Oct 2020 13:42:02 +0200 -Subject: [PATCH] Save the include subdir to a specific field - -The pkgconfig generation needs to know the include path w/out the -now-optional subdirectory. - -Fixes: #121 ---- - src/install.rs | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/src/install.rs b/src/install.rs -index 5105d46..e88be6c 100644 ---- a/src/install.rs -+++ b/src/install.rs -@@ -90,7 +90,11 @@ pub fn cinstall( - - let install_path_lib = append_to_destdir(destdir, &paths.libdir); - let install_path_pc = append_to_destdir(destdir, &paths.pkgconfigdir); -- let install_path_include = append_to_destdir(destdir, &paths.includedir); -+ let mut install_path_include = append_to_destdir(destdir, &paths.includedir); -+ if let Some(name) = paths.subdir_name { -+ install_path_include = install_path_include.join(name); -+ } -+ - let install_path_bin = append_to_destdir(destdir, &paths.bindir); - - fs::create_dir_all(&install_path_lib)?; -@@ -178,6 +182,7 @@ pub fn cinstall( - - #[derive(Debug)] - pub struct InstallPaths { -+ pub subdir_name: Option, - pub destdir: PathBuf, - pub prefix: PathBuf, - pub libdir: PathBuf, -@@ -200,13 +205,15 @@ impl InstallPaths { - .value_of("libdir") - .map(PathBuf::from) - .unwrap_or_else(|| prefix.join("lib")); -- let mut includedir = args -+ let includedir = args - .value_of("includedir") - .map(PathBuf::from) - .unwrap_or_else(|| prefix.join("include")); -- if capi_config.header.subdirectory { -- includedir = includedir.join(name); -- } -+ let subdir_name = if capi_config.header.subdirectory { -+ Some(PathBuf::from(name)) -+ } else { -+ None -+ }; - let bindir = args - .value_of("bindir") - .map(PathBuf::from) -@@ -217,6 +224,7 @@ impl InstallPaths { - .unwrap_or_else(|| libdir.join("pkgconfig")); - - InstallPaths { -+ subdir_name, - destdir, - prefix, - libdir, diff --git a/cargo-c-0.6.13.tar.gz b/cargo-c-0.6.13.tar.gz deleted file mode 100644 index 32eba67..0000000 --- a/cargo-c-0.6.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aa6b23c7ae19ec93e6edeb59be46056faccb915a02d1784a0c29ac7a3c6a8aea -size 15472 diff --git a/cargo-c-0.6.15.tar.gz b/cargo-c-0.6.15.tar.gz new file mode 100644 index 0000000..d71d782 --- /dev/null +++ b/cargo-c-0.6.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:528d2a66d1b866e2d860e42a0c9184b75873539cb86ece948c00f4b3bd5028fa +size 15591 diff --git a/cargo-c.changes b/cargo-c.changes index 79b3531..5ced444 100644 --- a/cargo-c.changes +++ b/cargo-c.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Oct 18 13:21:10 UTC 2020 - Andreas Schneider + +- Update to version 0.6.15 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.15 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.14 +- Removed 123.patch + ------------------------------------------------------------------- Tue Oct 13 11:53:19 UTC 2020 - Andreas Schneider diff --git a/cargo-c.spec b/cargo-c.spec index 77fd164..925d39e 100644 --- a/cargo-c.spec +++ b/cargo-c.spec @@ -18,7 +18,7 @@ Name: cargo-c -Version: 0.6.13 +Version: 0.6.15 Release: 0 Summary: Helper to build and install c-like libraries from Rust License: MIT @@ -29,8 +29,6 @@ URL: https://crates.io/crates/cargo-c Source0: https://github.com/lu-zero/cargo-c/archive/v%{version}/%{name}-%{version}.tar.gz Source1: vendor.tar.xz # -Patch0: https://github.com/lu-zero/cargo-c/pull/123.patch -# BuildRequires: rust-packaging BuildRequires: pkgconfig(openssl) diff --git a/vendor.tar.xz b/vendor.tar.xz index dc9021b..a4b9137 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:969d7396c444e0f1eef95a668279b4f71e57a1840259d9a648fd899e07945a10 -size 17183844 +oid sha256:6d6e3c266dbc815767af8a2ad4a77a16e87cd178ad797611d5a4106847bbc48e +size 17430204