From 88ee3e8750dc5a9ff4512d0543985b44ce447fcc Mon Sep 17 00:00:00 2001
From: 19909236985 <wuchaochao4@huawei.com>
Date: Thu, 24 Mar 2022 17:08:40 +0800
Subject: [PATCH 1/2] add rsyslog-gnutls

---
 oemaker.spec | 7 ++++++-
 rpmlist.xml  | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/oemaker.spec b/oemaker.spec
index d74ec0d..12e86ee 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -11,7 +11,7 @@ Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.0
-Release:        14
+Release:        15
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -130,6 +130,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Thu Mar 24 2022 wuchaochao <cyanrose@yeah.net> - 2.0.0-15
+- ID:NA
+- SUG:NA
+- DESC:  add rsyslog-gnutls package
+
 * Tue Feb 22 2022 jiangheng <jiangheng12@huawei.com> - 2.0.0-14
 - ID:NA
 - SUG:NA
diff --git a/rpmlist.xml b/rpmlist.xml
index e3e6c01..912c5e8 100644
--- a/rpmlist.xml
+++ b/rpmlist.xml
@@ -1192,6 +1192,7 @@
         <packagereq>rsyslog-mmsnmptrapd</packagereq>
         <packagereq>rsyslog-mysql</packagereq>
         <packagereq>rsyslog-snmp</packagereq>
+	<packagereq>rsyslog-gnutls</packagereq>
         <packagereq>rtkit</packagereq>
         <packagereq>rtkit-help</packagereq>
         <packagereq>samba-common-tools</packagereq>

From 448cf8154be7a7f7f41a8908bfcc758c63073578 Mon Sep 17 00:00:00 2001
From: x30004928 <xiangyuning@huawei.com>
Date: Wed, 13 Apr 2022 16:29:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0readme=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en.md | 3 +--
 README.md    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.en.md b/README.en.md
index 10de580..3ae8985 100644
--- a/README.en.md
+++ b/README.en.md
@@ -53,7 +53,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
 
 ##### isocut
 
-isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
+isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
 
   positional arguments:
 
@@ -64,5 +64,4 @@ isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k k
 
     -t    the temporary path which must be an absolute path and must be greater than 8g
     -r    extern rpm packages path
-    -k    kickstart file path
     -h    show the help message and exit
diff --git a/README.md b/README.md
index 244876a..8efd9f2 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ oemaker <font color=#0000FF >_[-h] [-t Type] [-p Product] [-v Version] [-r RELEA
 
 ##### isocut
 
-isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k kickstart file path] origin-iso dest-iso_</font>
+isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] origin-iso dest-iso_</font>
 
   positional arguments:
 
@@ -65,5 +65,4 @@ isocut <font color=#0000FF >_[-h] [-t temporary path] [-r extern rpm path] [-k k
 
     -t    the temporary path which must be an absolute path and must be greater than 8g
     -r    extern rpm packages path
-    -k    kickstart file path
     -h    show the help message and exit