From e49b04778b38d8cfdeeb5f04c085539f84d65561 Mon Sep 17 00:00:00 2001
From: jianli-97 <lijian2@kylinos.cn>
Date: Mon, 16 Oct 2023 16:12:11 +0800
Subject: [PATCH] change cincinnati url for nestos

---
 base-cincinnati-url-for-nestos.patch   |  8 -------
 change-cincinnati-url-for-nestos.patch | 33 ++++++++++++++++++++++++++
 rust-zincati.spec                      |  7 ++++--
 3 files changed, 38 insertions(+), 10 deletions(-)
 delete mode 100644 base-cincinnati-url-for-nestos.patch
 create mode 100644 change-cincinnati-url-for-nestos.patch

diff --git a/base-cincinnati-url-for-nestos.patch b/base-cincinnati-url-for-nestos.patch
deleted file mode 100644
index 7c6798b..0000000
--- a/base-cincinnati-url-for-nestos.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Nur zincati-0.0.18/dist/config.d/50-fedora-coreos-cincinnati.toml zincati-0.0.18-new/dist/config.d/50-fedora-coreos-cincinnati.toml
---- zincati-0.0.18/dist/config.d/50-fedora-coreos-cincinnati.toml	2021-02-28 06:16:41.000000000 +0800
-+++ zincati-0.0.18-new/dist/config.d/50-fedora-coreos-cincinnati.toml	2022-05-17 11:27:14.242121619 +0800
-@@ -1,3 +1,2 @@
--# Fedora CoreOS Cincinnati backend
- [cincinnati]
--base_url= "https://updates.coreos.fedoraproject.org"
-+base_url= "http://1.203.97.152:8080"
diff --git a/change-cincinnati-url-for-nestos.patch b/change-cincinnati-url-for-nestos.patch
new file mode 100644
index 0000000..c829f54
--- /dev/null
+++ b/change-cincinnati-url-for-nestos.patch
@@ -0,0 +1,33 @@
+From bd31264e125d4350380996957a2ae4d27b711747 Mon Sep 17 00:00:00 2001
+From: jianli-97 <lijian2@kylinos.cn>
+Date: Mon, 16 Oct 2023 16:03:49 +0800
+Subject: [PATCH] change cincinnati url for nestos
+
+---
+ dist/config.d/50-fedora-coreos-cincinnati.toml | 3 ---
+ dist/config.d/50-nestos-cincinnati.toml        | 3 +++
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ delete mode 100644 dist/config.d/50-fedora-coreos-cincinnati.toml
+ create mode 100644 dist/config.d/50-nestos-cincinnati.toml
+
+diff --git a/dist/config.d/50-fedora-coreos-cincinnati.toml b/dist/config.d/50-fedora-coreos-cincinnati.toml
+deleted file mode 100644
+index fe259f3..0000000
+--- a/dist/config.d/50-fedora-coreos-cincinnati.toml
++++ /dev/null
+@@ -1,3 +0,0 @@
+-# Fedora CoreOS Cincinnati backend
+-[cincinnati]
+-base_url= "https://updates.coreos.fedoraproject.org"
+diff --git a/dist/config.d/50-nestos-cincinnati.toml b/dist/config.d/50-nestos-cincinnati.toml
+new file mode 100644
+index 0000000..7a01c68
+--- /dev/null
++++ b/dist/config.d/50-nestos-cincinnati.toml
+@@ -0,0 +1,3 @@
++# NestOS Cincinnati backend
++[cincinnati]
++base_url= "http://www.nestos.org.cn:8080"
+-- 
+2.33.0
+
diff --git a/rust-zincati.spec b/rust-zincati.spec
index b684f4d..97eb78d 100644
--- a/rust-zincati.spec
+++ b/rust-zincati.spec
@@ -5,14 +5,14 @@
 
 Name:           rust-%{crate}
 Version:        0.0.24
-Release:        5
+Release:        6
 Summary:        Update agent for NestOS
 License:        Apache-2.0
 URL:            https://crates.io/crates/%{crate}
 Source0:        %{crate}-%{version}.crate
 Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
 Source2:        zincati-systemd-sysusers.conf
-Patch1:         base-cincinnati-url-for-nestos.patch
+Patch1:         change-cincinnati-url-for-nestos.patch
 Patch2:         modify-as-nestos-stream.patch
 
 BuildRequires:  rust-packaging
@@ -126,6 +126,9 @@ install -Dpm644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysusersdir}/zincati.conf
 %endif
 
 %changelog
+* Mon Oct 16 2023 lijian <lijian2@kylinos.cn> - 0.0.24-6
+- add change-cincinnati-url-for-nestos.patch
+
 * Mon May 29 2023 duyiwei <duyiwei@kylinos.cn> - 0.0.24-5
 - modify base-cincinnati-url-for-nestos.patch