From 63fe5c6219eef84c5128e407b9f5a00d2b1a67fa Mon Sep 17 00:00:00 2001
From: Xinliang Liu <xinliang.liu@linaro.org>
Date: Wed, 8 Mar 2023 02:23:23 +0000
Subject: [PATCH] Use package element in the _multibuild

Package and flavor elements should be the same here. Prefer
using package which means building more spec pkgs clearly.

Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
---
 _multibuild   | 2 +-
 zfs-kmod.spec | 7 +++++--
 zfs.spec      | 6 +++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/_multibuild b/_multibuild
index 99204dc..fa2a8da 100644
--- a/_multibuild
+++ b/_multibuild
@@ -1,3 +1,3 @@
 <multibuild>
-  <flavor>zfs-kmod</flavor>
+  <package>zfs-kmod</package>
 </multibuild>
diff --git a/zfs-kmod.spec b/zfs-kmod.spec
index 0b47861..30c2441 100644
--- a/zfs-kmod.spec
+++ b/zfs-kmod.spec
@@ -43,13 +43,13 @@
 Name:           %{module}-kmod
 
 Version:        2.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kernel module(s)
 
 Group:          System Environment/Kernel
 License:        CDDL-1.0
 URL:            https://github.com/openzfs/zfs
-Source0:        https://github.com/openzfs/zfs/releases/download//%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/openzfs/zfs/releases/download//%{module}-%{version}/%{module}-%{version}.tar.gz
 Source10:       kmodtool
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id} -u -n)
 %if 0%{?rhel}%{?fedora}%{?openEuler}
@@ -171,5 +171,8 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Mar 08 2023 Xinliang Liu <xinliang.liu@linaro.org> - 2.1.9-2
+- Fix Source0 url.
+
 * Fri Feb 24 2023 Xinliang Liu <xinliang.liu@linaro.org> - 2.1.9-1
 - Initial RPM release
diff --git a/zfs.spec b/zfs.spec
index 1cbfdc6..94ed999 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -117,7 +117,7 @@
 
 Name:           zfs
 Version:        2.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Commands to control the kernel modules and libraries
 
 Group:          System Environment/Kernel
@@ -584,5 +584,9 @@ systemctl --system daemon-reload >/dev/null || true
 %endif
 
 %changelog
+* Wed Mar 08 2023 Xinliang Liu <xinliang.liu@linaro.org> - 2.1.9-2
+- Mainly use package element instead of flavor in _multibuild file. And add a
+  changelog to pass CI error 'Every pr commit requires a changelog'.
+
 * Fri Feb 24 2023 Xinliang Liu <xinliang.liu@linaro.org> - 2.1.9-1
 - Initial RPM release
-- 
Gitee