Accepting request 856555 from devel:languages:rust

OBS-URL: https://build.opensuse.org/request/show/856555
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cargo-c?expand=0&rev=6

123.patch

@@ -1,66 +0,0 @@
-From f3df5af26c9b8a13e2beedb7de688d9b08861513 Mon Sep 17 00:00:00 2001
-From: Luca Barbato <lu_zero@gentoo.org>
-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<PathBuf>,
-     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,

cargo-c-0.6.13.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa6b23c7ae19ec93e6edeb59be46056faccb915a02d1784a0c29ac7a3c6a8aea
-size 15472

cargo-c-0.6.15.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:528d2a66d1b866e2d860e42a0c9184b75873539cb86ece948c00f4b3bd5028fa
+size 15591

cargo-c.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Oct 18 13:21:10 UTC 2020 - Andreas Schneider <asn@cryptomilk.org>
+
+- 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 <asn@cryptomilk.org>
 

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)
 

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