commit cargo-c for openSUSE:Factory
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
+
+- Added 123.patch
+ * Save the include subdir to a specific field
+
+---
+Wed Sep 9 10:33:48 UTC 2020 - Andreas Schneider
+
+- 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
+
+- 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
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,
++ 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/vend
commit cargo-c for openSUSE:Factory
Hello community,
here is the log from the commit of package cargo-c for openSUSE:Factory checked
in at 2020-07-06 16:24:11
Comparing /work/SRC/openSUSE:Factory/cargo-c (Old)
and /work/SRC/openSUSE:Factory/.cargo-c.new.3060 (New)
Package is "cargo-c"
Mon Jul 6 16:24:11 2020 rev:4 rq:818618 version:0.6.7
Changes:
--- /work/SRC/openSUSE:Factory/cargo-c/cargo-c.changes 2019-12-16
15:19:44.755154721 +0100
+++ /work/SRC/openSUSE:Factory/.cargo-c.new.3060/cargo-c.changes
2020-07-06 16:28:15.710972507 +0200
@@ -1,0 +2,23 @@
+Mon Jun 8 06:56:21 UTC 2020 - Andreas Schneider
+
+- Update to version 0.6.7
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.7
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.6
+
+---
+Tue Jun 2 10:45:00 UTC 2020 - Andreas Schneider
+
+- Update to version 0.6.5
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.5
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.4
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.3
+
+---
+Thu Apr 2 13:57:21 UTC 2020 - Andreas Schneider
+
+- Update to version 0.6.2
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.2
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.1
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.6.0
+
+---
Old:
cargo-c-0.5.0.tar.gz
New:
cargo-c-0.6.7.tar.gz
Other differences:
--
++ cargo-c.spec ++
--- /var/tmp/diff_new_pack.tmy6L5/_old 2020-07-06 16:28:19.622984502 +0200
+++ /var/tmp/diff_new_pack.tmy6L5/_new 2020-07-06 16:28:19.622984502 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cargo-c
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2019 Andreas Schneider .
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: cargo-c
-Version:0.5.0
+Version:0.6.7
Release:0
Summary:Helper to build and install c-like libraries from Rust
License:MIT
@@ -30,6 +30,7 @@
Source1:vendor.tar.xz
#
BuildRequires: rust-packaging
+BuildRequires: pkgconfig(openssl)
%description
The is a cargo applet to build and install C-ABI compatibile dynamic and static
@@ -65,6 +66,9 @@
%install
%cargo_install
+find %{buildroot} -name .crates2.json -delete
+rm -rf %{buildroot}%{_datadir}/cargo/registry
+
%files
%license LICENSE
%doc README.md
++ cargo-c-0.5.0.tar.gz -> cargo-c-0.6.7.tar.gz ++
2297 lines of diff (skipped)
++ vendor.tar.xz ++
/work/SRC/openSUSE:Factory/cargo-c/vendor.tar.xz
/work/SRC/openSUSE:Factory/.cargo-c.new.3060/vendor.tar.xz differ: char 15,
line 1
commit cargo-c for openSUSE:Factory
Hello community,
here is the log from the commit of package cargo-c for openSUSE:Factory checked
in at 2019-12-16 15:19:38
Comparing /work/SRC/openSUSE:Factory/cargo-c (Old)
and /work/SRC/openSUSE:Factory/.cargo-c.new.4691 (New)
Package is "cargo-c"
Mon Dec 16 15:19:38 2019 rev:3 rq:757184 version:0.5.0
Changes:
--- /work/SRC/openSUSE:Factory/cargo-c/cargo-c.changes 2019-12-12
23:18:32.262211466 +0100
+++ /work/SRC/openSUSE:Factory/.cargo-c.new.4691/cargo-c.changes
2019-12-16 15:19:44.755154721 +0100
@@ -1,0 +2,7 @@
+Sun Dec 15 13:13:58 UTC 2019 - Andreas Schneider
+
+- Update to version 0.5.0
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.5.0
+ * https://github.com/lu-zero/cargo-c/releases/tag/v0.4.0
+
+---
Old:
cargo-c-0.3.1.tar.gz
New:
cargo-c-0.5.0.tar.gz
Other differences:
--
++ cargo-c.spec ++
--- /var/tmp/diff_new_pack.eG08EU/_old 2019-12-16 15:19:46.247154100 +0100
+++ /var/tmp/diff_new_pack.eG08EU/_new 2019-12-16 15:19:46.251154099 +0100
@@ -18,7 +18,7 @@
Name: cargo-c
-Version:0.3.1
+Version:0.5.0
Release:0
Summary:Helper to build and install c-like libraries from Rust
License:MIT
++ cargo-c-0.3.1.tar.gz -> cargo-c-0.5.0.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cargo-c-0.3.1/Cargo.toml new/cargo-c-0.5.0/Cargo.toml
--- old/cargo-c-0.3.1/Cargo.toml2019-11-16 18:29:05.0 +0100
+++ new/cargo-c-0.5.0/Cargo.toml2019-12-14 17:44:14.0 +0100
@@ -1,6 +1,6 @@
[package]
name = "cargo-c"
-version = "0.3.1"
+version = "0.5.0"
authors = ["Luca Barbato "]
description = "Helper program to build and install c-like libraries"
license = "MIT"
@@ -26,7 +26,7 @@
cargo_metadata = "0.9"
structopt = "0.3"
regex = "1"
-cbindgen = "0.9"
+cbindgen = "0.11"
toml = "0.5"
serde = "1.0"
serde_derive = "1.0"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cargo-c-0.3.1/README.md new/cargo-c-0.5.0/README.md
--- old/cargo-c-0.3.1/README.md 2019-11-16 18:29:05.0 +0100
+++ new/cargo-c-0.5.0/README.md 2019-12-14 17:44:14.0 +0100
@@ -30,7 +30,7 @@
the first member is the crate you want to export, that means that you might
have [to add a "." member at the start of the list][diff-3].
- Since Rust 1.38, also add "staticlib" to the "lib" `crate-type`.
-- Remember to [add][diff-4] a [`cbindgen.toml`][cbinden-toml] and fill it with
+- Remember to [add][diff-4] a [`cbindgen.toml`][cbindgen-toml] and fill it with
at least the include guard and probably you want to set the language to C (it
defaults to C++)
- Once you are happy with the result update your documentation to tell the user
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cargo-c-0.3.1/src/main.rs
new/cargo-c-0.5.0/src/main.rs
--- old/cargo-c-0.3.1/src/main.rs 2019-11-16 18:29:05.0 +0100
+++ new/cargo-c-0.5.0/src/main.rs 2019-12-14 17:44:14.0 +0100
@@ -154,7 +154,7 @@
let targetdir = cfg.targetdir.join("deps");
let (shared_lib, static_lib, impl_lib, def) = match (os.as_str(),
env.as_str()) {
-("linux", _) => {
+("linux", _) | ("freebsd", _) | ("dragonfly", _) | ("netbsd", _)
=> {
let static_lib = targetdir.join(&format!("lib{}-{}.a", name,
hash));
let shared_lib = targetdir.join(&format!("lib{}-{}.so", name,
hash));
(shared_lib, static_lib, None, None)
@@ -272,7 +272,7 @@
.find(|t| t.kind.iter().any(|x| x == "lib"))
.expect("Cannot find a library target")
.name
-.clone();
+.replace("-", "_");
Config {
name,
@@ -397,7 +397,7 @@
let warning = config.autogen_warning.unwrap_or_default();
let version_info = format!(
"\n#define {0}_MAJOR {1}\n#define {0}_MINOR {2}\n#define {0}_PATCH
{3}\n",
-self.pkg.name.to_uppercase().replace("-", "_"),
+self.name.to_uppercase(),
self.pkg.version.major,
self.pkg.version.minor,
self.pkg.version.patch
@@ -428,7 +428,7 @@
let libdir = &self.libdir;
let target_dir = &self.targetdir;
-if os == "linux" {
+if os == "linux" || os == "freebsd" || os == "dragonfly" || os ==
"netbsd" {
lines.push(format!("-Wl,-soname,lib{}.so.{}", name, major));
} else if os == "macos" {
let line =
format!("-Wl,-install_name,{1}/lib{0}.{2}.{3}.{4}.dylib,-c
commit cargo-c for openSUSE:Factory
Hello community,
here is the log from the commit of package cargo-c for openSUSE:Factory checked
in at 2019-12-12 23:18:25
Comparing /work/SRC/openSUSE:Factory/cargo-c (Old)
and /work/SRC/openSUSE:Factory/.cargo-c.new.4691 (New)
Package is "cargo-c"
Thu Dec 12 23:18:25 2019 rev:2 rq:755868 version:0.3.1
Changes:
--- /work/SRC/openSUSE:Factory/cargo-c/cargo-c.changes 2019-11-28
10:14:05.691637151 +0100
+++ /work/SRC/openSUSE:Factory/.cargo-c.new.4691/cargo-c.changes
2019-12-12 23:18:32.262211466 +0100
@@ -1,0 +2,5 @@
+Mon Dec 9 16:03:39 UTC 2019 - Andreas Schneider
+
+- Set rust compiler and rust flags
+
+---
Other differences:
--
++ cargo-c.spec ++
--- /var/tmp/diff_new_pack.T4x0xq/_old 2019-12-12 23:18:33.238211378 +0100
+++ /var/tmp/diff_new_pack.T4x0xq/_new 2019-12-12 23:18:33.238211378 +0100
@@ -1,6 +1,7 @@
#
-# spec file for package rust-cargo-c
+# spec file for package cargo-c
#
+# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2019 Andreas Schneider .
#
# All modifications and additions to the file contributed by third parties
@@ -15,14 +16,14 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
+
Name: cargo-c
Version:0.3.1
Release:0
Summary:Helper to build and install c-like libraries from Rust
+License:MIT
Group: Development/Languages/Rust
-# Upstream license specification: MIT
-License:MIT
URL:https://crates.io/crates/cargo-c
#
Source0:
https://github.com/lu-zero/cargo-c/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -48,6 +49,10 @@
replace-with = 'vendored-sources'
[source.vendored-sources]
directory = './vendor'
+[build]
+rustc = "%{__rustc}"
+rustdoc = "%{__rustdoc}"
+rustflags = %{__global_rustflags_toml}
[install]
root = '%{buildroot}%{_prefix}'
[term]
