From f5341e33cf49cf2101a3b90949f1f0b19b37dbc743b2993976cb600020304cf4 Mon Sep 17 00:00:00 2001
From: William Brown <william.brown@suse.com>
Date: Wed, 9 Jun 2021 00:44:33 +0000
Subject: [PATCH] Accepting request 896830 from
 home:firstyear:branches:devel:languages:rust

- Update to version 0.8.1~git0.cce1b08:
  * Prepare for release
  * Set the capi.library.rustflags
  * Add a simple way to set the RUSTFLAGS from Cargo.toml
  * CI: test example project in Windows/MSYS2 (#191)
  * Update cargo requirement from 0.52 to 0.53
  * Upgrade to GitHub-native Dependabot
  * Default to nightly
  * Use codecov
  * Move the code coverage in a stand-alone script
  * Enable colored help

OBS-URL: https://build.opensuse.org/request/show/896830
OBS-URL: https://build.opensuse.org/package/show/devel:languages:rust/cargo-c?expand=0&rev=21
---
 _service                          | 23 +++++++++++++++++++-
 cargo-c-0.8.0.tar.gz              |  3 ---
 cargo-c-0.8.1~git0.cce1b08.tar.xz |  3 +++
 cargo-c.changes                   | 15 +++++++++++++
 cargo-c.spec                      | 35 ++++++++++++-------------------
 cargo_config                      |  5 +++++
 vendor.tar.xz                     |  4 ++--
 7 files changed, 60 insertions(+), 28 deletions(-)
 delete mode 100644 cargo-c-0.8.0.tar.gz
 create mode 100644 cargo-c-0.8.1~git0.cce1b08.tar.xz
 create mode 100644 cargo_config

diff --git a/_service b/_service
index f2d7c46..1c2a804 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,26 @@
 <services>
+  <service mode="disabled" name="obs_scm">
+    <param name="url">https://github.com/lu-zero/cargo-c.git</param>
+    <param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
+    <param name="scm">git</param>
+    <param name="revision">v0.8.1</param>
+    <param name="match-tag">*</param>
+    <param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
+    <param name="versionrewrite-replacement">\1</param>
+    <param name="changesgenerate">enable</param>
+    <param name="changesauthor">william.brown@suse.com</param>
+  </service>
+  <service mode="disabled" name="tar" />
+  <service mode="disabled" name="recompress">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service mode="disabled" name="set_version"/>
   <service name="cargo_vendor" mode="disabled">
-    <param name="srcdir">cargo-c-0.8.0</param>
+     <param name="srcdir">cargo-c</param>
+     <param name="compression">xz</param>
+  </service>
+  <service name="cargo_audit" mode="disabled">
+     <param name="srcdir">cargo-c</param>
   </service>
 </services>
diff --git a/cargo-c-0.8.0.tar.gz b/cargo-c-0.8.0.tar.gz
deleted file mode 100644
index 8fe4abb..0000000
--- a/cargo-c-0.8.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2bcb143317e7f579bcfd13ef3f230cf72961ccc79abb176789f8d1fdff03fd35
-size 22362
diff --git a/cargo-c-0.8.1~git0.cce1b08.tar.xz b/cargo-c-0.8.1~git0.cce1b08.tar.xz
new file mode 100644
index 0000000..ef84605
--- /dev/null
+++ b/cargo-c-0.8.1~git0.cce1b08.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81bfa4f0f3f9f98e270413025b4da8cde737375a0eb1f4e8c5e38713ccc301f3
+size 20736
diff --git a/cargo-c.changes b/cargo-c.changes
index 1e2fb25..0852f15 100644
--- a/cargo-c.changes
+++ b/cargo-c.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Jun 02 05:40:32 UTC 2021 - william.brown@suse.com
+
+- Update to version 0.8.1~git0.cce1b08:
+  * Prepare for release
+  * Set the capi.library.rustflags
+  * Add a simple way to set the RUSTFLAGS from Cargo.toml
+  * CI: test example project in Windows/MSYS2 (#191)
+  * Update cargo requirement from 0.52 to 0.53
+  * Upgrade to GitHub-native Dependabot
+  * Default to nightly
+  * Use codecov
+  * Move the code coverage in a stand-alone script
+  * Enable colored help
+
 -------------------------------------------------------------------
 Tue Apr  6 02:21:28 UTC 2021 - William Brown <william.brown@suse.com>
 
diff --git a/cargo-c.spec b/cargo-c.spec
index 8380245..efab0b1 100644
--- a/cargo-c.spec
+++ b/cargo-c.spec
@@ -17,20 +17,22 @@
 #
 
 
+%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2
+
 Name:           cargo-c
-Version:        0.8.0
+Version:        0.8.1~git0.cce1b08
 Release:        0
 Summary:        Helper to build and install c-like libraries from Rust
 License:        MIT
 Group:          Development/Languages/Rust
 
 URL:            https://crates.io/crates/cargo-c
-#
-Source0:        https://github.com/lu-zero/cargo-c/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        %{name}-%{version}.tar.xz
 Source1:        vendor.tar.xz
-#
+Source2:        cargo_config
+
 Source1000:     README.suse-maint
-BuildRequires:  rust-packaging
+BuildRequires:  cargo
 BuildRequires:  pkgconfig(openssl)
 
 %description
@@ -45,30 +47,19 @@ software.
 %autosetup -a1 -p1
 
 install -d -m 0755 .cargo
-cat >.cargo/config <<EOF
-[source.crates-io]
-registry = 'https://github.com/rust-lang/crates.io-index'
-replace-with = 'vendored-sources'
-[source.vendored-sources]
-directory = './vendor'
-[build]
-rustc = "%{__rustc}"
-rustdoc = "%{__rustdoc}"
-rustflags = %{__global_rustflags_toml}
-[install]
-root = '%{buildroot}%{_prefix}'
-[term]
-verbose = true
-EOF
+cp %{SOURCE2} .cargo/config
 
 %build
-%cargo_build
+export RUSTFLAGS="%{rustflags}"
+cargo build --offline --release
 
 %install
-%cargo_install
+export RUSTFLAGS="%{rustflags}"
+cargo install --offline --root=%{buildroot}%{_prefix} --path .
 
 find %{buildroot} -name .crates2.json -delete
 rm -rf %{buildroot}%{_datadir}/cargo/registry
+rm %{buildroot}%{_prefix}/.crates.toml
 
 %files
 %license LICENSE
diff --git a/cargo_config b/cargo_config
new file mode 100644
index 0000000..6fb4ff4
--- /dev/null
+++ b/cargo_config
@@ -0,0 +1,5 @@
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
\ No newline at end of file
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 3c88f05..70ecfa0 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d5c54f5fb58483f14ccca660c62b44d1ea486bbf84529d23cc3211fff90b1693
-size 22091880
+oid sha256:b52c85fa56098e2aecd7563731a4477e8f1d54187a7ac598b06cce079b32c674
+size 22219724