diff --git a/README.suse-maint b/README.suse-maint
index b4535ea..25bcd46 100644
--- a/README.suse-maint
+++ b/README.suse-maint
@@ -2,24 +2,16 @@
## Prerequisites:
You need the download_files and cargo_vendor obs services installed:
- zypper in obs-service-download_files obs-service-cargo_vendor
+ zypper in obs-service-obs_scm obs-service-cargo_vendor
## Updating to a new version from upstream
-Edit the spec file and update the version variable.
+Edit the _service file and update the revision parameter.
Download the new source file by running:
- osc service ra download_files
-
-Uncompress the cargo-c-%{version}.tar.gz file:
- tar xvfz cargo-c-%{version}.tar.gz
-
-This will create a cargo-c-%{version} directory
-
-Edit the _service file and set the srcdir param
-to the extracted directory.
+ osc service mr obs_scm
Run the cargo_vendor service with:
- osc service disabledrun
+ osc service mr cargo_vendor
Update the changelog file with the upstream release notes.
diff --git a/_service b/_service
index 4b645f6..0f89285 100644
--- a/_service
+++ b/_service
@@ -3,14 +3,14 @@
https://github.com/lu-zero/cargo-c.git
@PARENT_TAG@~git@TAG_OFFSET@.%h
git
- v0.9.27
+ v0.10.3
*
v(\d+\.\d+\.\d+)
\1
enable
-
-
+
+
*.tar
xz
@@ -20,7 +20,4 @@
xz
true
-
- cargo-c
-
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..7f2e7f4
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ https://github.com/lu-zero/cargo-c.git
+ ee7d7ef74b9c1fa00c6780da41a838752c76b3eb
\ No newline at end of file
diff --git a/cargo-c-0.10.3~git0.ee7d7ef.obscpio b/cargo-c-0.10.3~git0.ee7d7ef.obscpio
new file mode 100644
index 0000000..6797fec
--- /dev/null
+++ b/cargo-c-0.10.3~git0.ee7d7ef.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e0d02b79b50a1f8ca5b46607a7b630b584602281a3959d34f536a0f82de4f19
+size 135691
diff --git a/cargo-c-0.9.27~git0.54774e0.tar.xz b/cargo-c-0.9.27~git0.54774e0.tar.xz
deleted file mode 100644
index c1ed3de..0000000
--- a/cargo-c-0.9.27~git0.54774e0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a862cc9c8ce1d286bc98b0e142e1db0a648942c2c0e8e1bd5295d84b67691a4b
-size 26136
diff --git a/cargo-c.changes b/cargo-c.changes
index 4e5e25e..651b614 100644
--- a/cargo-c.changes
+++ b/cargo-c.changes
@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Fri Sep 20 03:18:07 UTC 2024 - William Brown
+
+- bsc#1230683 - CVE-2024-45405 - gix-path improper path resolution
+
+-------------------------------------------------------------------
+Tue Aug 27 09:20:15 UTC 2024 - Enrico Belleri
+
+- Update to version 0.10.3~git0.ee7d7ef:
+ * Wire in the heuristics
+ * Implement heuristics for target-specific install paths
+ * Fix the generated header fingerprinting logic
+ * Make notice about missing windows debug files verbose-only
+ * Update dependencies
+ * Require cargo 0.80.0
+- Use macros from cargo-packaging
+- Remove cargo_config: contained in vendor.tar
+- Remove cargo_audit service: now part of cargo_vendor
+- Remove custom rustflags and let the macros set them instead
+
+-------------------------------------------------------------------
+Tue Jun 04 19:59:22 UTC 2024 - david.mulder@suse.com
+
+- Update to version 0.9.32~git0.56dfe34:
+ * Prepare for release
+ * Bump cargo version
+ * Use clone_from/clone_into
+ * Do not install the versioned links and lib on Android
+ * docs: add rustls-ffi to README users list
+ * Bump the msrv again
+ * Bump msrv
+ * Bump cargo version
+ * Match the beaviour of meson regarding relative paths in the install directories
+ * Bump cargo version
+
-------------------------------------------------------------------
Tue Oct 17 10:43:31 UTC 2023 - bjorn.lie@gmail.com
diff --git a/cargo-c.obsinfo b/cargo-c.obsinfo
new file mode 100644
index 0000000..9f9c828
--- /dev/null
+++ b/cargo-c.obsinfo
@@ -0,0 +1,4 @@
+name: cargo-c
+version: 0.10.3~git0.ee7d7ef
+mtime: 1722315713
+commit: ee7d7ef74b9c1fa00c6780da41a838752c76b3eb
diff --git a/cargo-c.spec b/cargo-c.spec
index ea52174..4e0709d 100644
--- a/cargo-c.spec
+++ b/cargo-c.spec
@@ -1,7 +1,7 @@
#
# spec file for package cargo-c
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2019 Andreas Schneider .
#
# All modifications and additions to the file contributed by third parties
@@ -17,10 +17,8 @@
#
-%global rustflags -Clink-arg=-Wl,-z,relro,-z,now -C debuginfo=2
-
Name: cargo-c
-Version: 0.9.27~git0.54774e0
+Version: 0.10.3~git0.ee7d7ef
Release: 0
Summary: Helper to build and install c-like libraries from Rust
License: MIT
@@ -29,10 +27,9 @@ Group: Development/Languages/Rust
URL: https://crates.io/crates/cargo-c
Source0: %{name}-%{version}.tar.xz
Source1: vendor.tar.xz
-Source2: cargo_config
-
Source1000: README.suse-maint
-BuildRequires: cargo
+BuildRequires: cargo >= 0.80.0
+BuildRequires: cargo-packaging
BuildRequires: pkgconfig(openssl)
%description
@@ -46,20 +43,14 @@ software.
%prep
%autosetup -a1 -p1
-install -d -m 0755 .cargo
-cp %{SOURCE2} .cargo/config
-
%build
-export RUSTFLAGS="%{rustflags}"
-cargo build --offline --release
+%{cargo_build}
%install
-export RUSTFLAGS="%{rustflags}"
-cargo install --offline --root=%{buildroot}%{_prefix} --path .
+%{cargo_install}
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
deleted file mode 100644
index 6fb4ff4..0000000
--- a/cargo_config
+++ /dev/null
@@ -1,5 +0,0 @@
-[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 044bf09..2b85f27 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:6c40ec1bc87894b8408f3d32c102e52f7d0cac6fced38c37341238485b23e6d7
-size 43869584
+oid sha256:87fc1b2bd75539e4798e1321bf80fc6cf24796c9d02236fe34f6772d4169f01e
+size 45522468