Hello community, here is the log from the commit of package cargo-c for openSUSE:Factory checked in at 2020-10-15 13:47:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cargo-c (Old) and /work/SRC/openSUSE:Factory/.cargo-c.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cargo-c" Thu Oct 15 13:47:49 2020 rev:5 rq:841543 version:0.6.13 Changes: -------- --- /work/SRC/openSUSE:Factory/cargo-c/cargo-c.changes 2020-07-06 16:28:15.710972507 +0200 +++ /work/SRC/openSUSE:Factory/.cargo-c.new.3486/cargo-c.changes 2020-10-15 13:48:02.961240367 +0200 @@ -1,0 +2,22 @@ +Tue Oct 13 11:53:19 UTC 2020 - Andreas Schneider <a...@cryptomilk.org> + +- Added 123.patch + * Save the include subdir to a specific field + +------------------------------------------------------------------- +Wed Sep 9 10:33:48 UTC 2020 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.6.13 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.13 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.12 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.11 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.10 + +------------------------------------------------------------------- +Mon Jul 13 15:32:40 UTC 2020 - Andreas Schneider <a...@cryptomilk.org> + +- Update to version 0.6.9 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.9 + * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.8 + +------------------------------------------------------------------- Old: ---- cargo-c-0.6.7.tar.gz New: ---- 123.patch cargo-c-0.6.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cargo-c.spec ++++++ --- /var/tmp/diff_new_pack.PkO8Yi/_old 2020-10-15 13:48:06.165241707 +0200 +++ /var/tmp/diff_new_pack.PkO8Yi/_new 2020-10-15 13:48:06.169241709 +0200 @@ -18,7 +18,7 @@ Name: cargo-c -Version: 0.6.7 +Version: 0.6.13 Release: 0 Summary: Helper to build and install c-like libraries from Rust License: MIT @@ -29,6 +29,8 @@ 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) @@ -72,7 +74,8 @@ %files %license LICENSE %doc README.md -%{_bindir}/cargo-cinstall +%{_bindir}/cargo-capi %{_bindir}/cargo-cbuild +%{_bindir}/cargo-cinstall %changelog ++++++ 123.patch ++++++ >From f3df5af26c9b8a13e2beedb7de688d9b08861513 Mon Sep 17 00:00:00 2001 From: Luca Barbato <lu_z...@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.7.tar.gz -> cargo-c-0.6.13.tar.gz ++++++ ++++ 1759 lines of diff (skipped) ++++++ vendor.tar.xz ++++++ /work/SRC/openSUSE:Factory/cargo-c/vendor.tar.xz /work/SRC/openSUSE:Factory/.cargo-c.new.3486/vendor.tar.xz differ: char 15, line 1
