From 10013c2351cdbe45cb68a789f89a8a8147bf7f0dfb27137b45ecd1f547c05eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 28 Nov 2024 17:40:42 +0100
Subject: [PATCH] Sync from SUSE:SLFO:Main cargo-packaging revision
 7c32cb786e3cf14bc322de3f13d738cd

---
 _servicedata                   |  2 +-
 cargo-packaging-1.2.0+3.tar.xz |  3 ---
 cargo-packaging-1.2.0+5.tar.xz |  3 +++
 cargo-packaging.changes        | 28 ++++++++++++++++++++++++++++
 cargo-packaging.spec           |  9 +++------
 cargo_config                   |  5 -----
 vendor.tar.xz                  |  4 ++--
 7 files changed, 37 insertions(+), 17 deletions(-)
 delete mode 100644 cargo-packaging-1.2.0+3.tar.xz
 create mode 100644 cargo-packaging-1.2.0+5.tar.xz
 delete mode 100644 cargo_config

diff --git a/_servicedata b/_servicedata
index 80a9ad3..c7c5092 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/Firstyear/cargo-packaging.git</param>
-              <param name="changesrevision">423b9973eabe8c34ba161144d04312439a006b80</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">158d4099bf111d05bd8a0967ce4976570b6716da</param></service></servicedata>
\ No newline at end of file
diff --git a/cargo-packaging-1.2.0+3.tar.xz b/cargo-packaging-1.2.0+3.tar.xz
deleted file mode 100644
index f33dc38..0000000
--- a/cargo-packaging-1.2.0+3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41757415fc137f1631c0221c49b6aa35ad57623fea629e60f0afaa9fe231d5a7
-size 9052
diff --git a/cargo-packaging-1.2.0+5.tar.xz b/cargo-packaging-1.2.0+5.tar.xz
new file mode 100644
index 0000000..c917d7f
--- /dev/null
+++ b/cargo-packaging-1.2.0+5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:436b429596210a62125724d07f29b3f89ae511ce6adc684ac5af5996f09f9b60
+size 9060
diff --git a/cargo-packaging.changes b/cargo-packaging.changes
index bad8320..b39ffc2 100644
--- a/cargo-packaging.changes
+++ b/cargo-packaging.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Jul 19 03:18:37 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Resolve build failure when backported to 15-SP3
+
+-------------------------------------------------------------------
+Fri Jul 19 02:01:33 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Depend on provides of rust to allow older compiler version usage
+
+-------------------------------------------------------------------
+Fri Apr  5 00:50:37 UTC 2024 - William Brown <william.brown@suse.com>
+
+- Remove cargo_config that is now part of vendor.tar
+
+-------------------------------------------------------------------
+Thu Apr 04 00:31:58 UTC 2024 - william.brown@suse.com
+
+- bsc#1222175 - prevent stripping debug info
+- Update to version 1.2.0+5:
+  * Prevent stripping debuginfo in release by default (#7)
+
+-------------------------------------------------------------------
+Mon Aug 14 04:47:50 UTC 2023 - william.brown@suse.com
+
+- Update to version 1.2.0+4:
+  * macros.cargo: Drop bashisms (#4)
+
 -------------------------------------------------------------------
 Mon Jun 19 23:37:09 UTC 2023 - william.brown@suse.com
 
diff --git a/cargo-packaging.spec b/cargo-packaging.spec
index baf0d87..673d930 100644
--- a/cargo-packaging.spec
+++ b/cargo-packaging.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cargo-packaging
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           cargo-packaging
-Version:        1.2.0+3
+Version:        1.2.0+5
 Release:        0
 Summary:        Macros and tools to assist with cargo and rust packaging
 License:        MPL-2.0
@@ -25,9 +25,8 @@ Group:          Development/Languages/Rust
 URL:            https://github.com/Firstyear/cargo-packaging
 Source0:        %{name}-%{version}.tar.xz
 Source1:        vendor.tar.xz
-Source2:        cargo_config
-Requires:       cargo
 Requires:       cargo-auditable
+Requires:       rust+cargo
 Requires:       zstd
 BuildRequires:  cargo
 BuildRequires:  zstd
@@ -40,8 +39,6 @@ that follows upstream rust's best practices.
 
 %prep
 %autosetup -a1
-mkdir .cargo
-cp %{SOURCE2} .cargo/config
 
 %build
 cargo build --offline --release
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 cee5911..c51300a 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4efb668aca1e946a73d086135a9ea0caa1d955c4399f65d5dbdb95eb70c8384c
-size 6661716
+oid sha256:dd5a9f53c42ca81658216af705ec17792de2b6aac2ad90ea9e0ef7fae01e95dc
+size 7399280