From a9e5b1f688de3f6ac1b86e6ae2467497a8d31d59dbc57fbcce640f3960bea68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Wed, 22 Mar 2023 15:13:58 +0000
Subject: [PATCH] Accepting request 1073806 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/1073806
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-tour?expand=0&rev=10
---
 _service                | 26 ++++++++++++++++++++++++++
 cargo_config            |  5 +++++
 gnome-tour-44.0.obscpio |  3 +++
 gnome-tour-44.0.tar.xz  |  3 ---
 gnome-tour.changes      |  8 ++++++++
 gnome-tour.obsinfo      |  4 ++++
 gnome-tour.spec         | 16 ++++++++++++----
 vendor.tar.zst          |  3 +++
 8 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 _service
 create mode 100644 cargo_config
 create mode 100644 gnome-tour-44.0.obscpio
 delete mode 100644 gnome-tour-44.0.tar.xz
 create mode 100644 gnome-tour.obsinfo
 create mode 100644 vendor.tar.zst

diff --git a/_service b/_service
new file mode 100644
index 0000000..c059c0a
--- /dev/null
+++ b/_service
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="manual">
+    <param name="url">https://gitlab.gnome.org/GNOME/gnome-tour.git</param>
+    <param name="scm">git</param>
+    <param name="revision">refs/tags/44.0</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
+    <param name="versionrewrite-pattern">(.*)\+0</param>
+    <param name="versionrewrite-replacement">\1</param>
+<!--   <param name="changesgenerate">enable</param> -->
+  </service>
+  <service name="set_version" mode="manual"/>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">xz</param>
+  </service>
+  <service name="cargo_vendor" mode="manual">
+  <param name="srcdir">gnome-tour</param>
+  <param name="update">true</param>
+  </service>
+  <service name="cargo_audit" mode="manual">
+  <param name="srcdir">gnome-tour</param>
+  </service>
+</services>
+
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/gnome-tour-44.0.obscpio b/gnome-tour-44.0.obscpio
new file mode 100644
index 0000000..2beb44b
--- /dev/null
+++ b/gnome-tour-44.0.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a5cb50be9f262e6ece5059527db7858969353adb21458fd0df24977457cd34e2
+size 731660
diff --git a/gnome-tour-44.0.tar.xz b/gnome-tour-44.0.tar.xz
deleted file mode 100644
index 3e57928..0000000
--- a/gnome-tour-44.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06de7677dd1c590d0ea33a032c9ccf4c37c62bc56215b823c879e42ee630c2b6
-size 14401464
diff --git a/gnome-tour.changes b/gnome-tour.changes
index c550a1e..9a01fb5 100644
--- a/gnome-tour.changes
+++ b/gnome-tour.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Mar 20 20:59:58 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Switch to cargo_packaging:
+  + Drop cargo and rust BuildRequires, add cargo-packaging
+    BuildRequires and macros.
+  + Use source services to generate tarball + run cargo packaging.
+
 -------------------------------------------------------------------
 Mon Mar 20 09:33:13 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnome-tour.obsinfo b/gnome-tour.obsinfo
new file mode 100644
index 0000000..6c3888b
--- /dev/null
+++ b/gnome-tour.obsinfo
@@ -0,0 +1,4 @@
+name: gnome-tour
+version: 44.0
+mtime: 1679298248
+commit: 46ca411004a49ef963e3a7df7b928ebb976bed72
diff --git a/gnome-tour.spec b/gnome-tour.spec
index 1ea075b..3bfceab 100644
--- a/gnome-tour.spec
+++ b/gnome-tour.spec
@@ -16,6 +16,8 @@
 #
 
 
+%global rustflags '-Clink-arg=-Wl,-z,relro,-z,now'
+
 Name:           gnome-tour
 Version:        44.0
 Release:        0
@@ -23,13 +25,14 @@ Summary:        GNOME Tour & Greeter
 License:        GPL-3.0-or-later
 Group:          System/GUI/GNOME
 URL:            https://gitlab.gnome.org/GNOME/gnome-tour
-Source0:        https://download.gnome.org/sources/gnome-tour/44/%{name}-%{version}.tar.xz
+Source0:        %{name}-%{version}.tar.xz
+Source2:        vendor.tar.zst
+Source3:        cargo_config
 
 BuildRequires:  appstream-glib
-BuildRequires:  cargo
+BuildRequires:  cargo-packaging
 BuildRequires:  desktop-file-utils
 BuildRequires:  meson
-BuildRequires:  rust
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.56
 BuildRequires:  pkgconfig(glib-2.0) >= 2.64
@@ -42,20 +45,25 @@ A guided tour and greeter for GNOME.
 %lang_package
 
 %prep
-%autosetup -p1
+%autosetup -p1 -a2
+mkdir .cargo
+cp %{SOURCE3} .cargo/config
 
 %build
+export RUSTFLAGS=%{rustflags}
 %meson \
 	-D profile=default \
 	%{nil}
 %meson_build
 
 %install
+export RUSTFLAGS=%{rustflags}
 %meson_install
 %find_lang %{name} %{?no_lang_C}
 
 %check
 %meson_test
+%cargo_test
 
 %files
 %license LICENSE.md
diff --git a/vendor.tar.zst b/vendor.tar.zst
new file mode 100644
index 0000000..237bfee
--- /dev/null
+++ b/vendor.tar.zst
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa77477f43f089ba2bac2550e536276a951522958b65869b374fc3a41f6c24ea
+size 16314023