!48 change for issue I3DJJW

From: @miao_kaibo
Reviewed-by: @zhuchunyi
Signed-off-by: @zhuchunyi

0001-replace-rsyslog-gnutls-by-rsyslog.patch

@@ -1,82 +0,0 @@
-From 514f66a2d6da4f75aac4d1a0261fe3d5137f76df Mon Sep 17 00:00:00 2001
-From: miao_kaibo <miaokaibo@outlook.com>
-Date: Sun, 21 Mar 2021 18:25:35 +0800
-Subject: [PATCH] replace rsyslog-gnutls by rsyslog
-
----
- isomaker/config/aarch64/normal.xml | 3 ---
- isomaker/config/rpmlist.xml        | 1 -
- isomaker/config/x86_64/normal.xml  | 3 ---
- 3 files changed, 7 deletions(-)
-
-diff --git a/isomaker/config/aarch64/normal.xml b/isomaker/config/aarch64/normal.xml
-index 35350f7..12ed45f 100644
---- a/isomaker/config/aarch64/normal.xml
-+++ b/isomaker/config/aarch64/normal.xml
-@@ -912,7 +912,6 @@
-       <packagereq type="default">freeradius</packagereq>
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
--      <packagereq type="optional">rsyslog-gnutls</packagereq>
-       <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-@@ -938,7 +937,6 @@
-       <packagereq type="optional">freeradius</packagereq>
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
--      <packagereq type="optional">rsyslog-gnutls</packagereq>
-       <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-@@ -1316,7 +1314,6 @@
-       <packagereq type="default">libstoragemgmt</packagereq>
-       <packagereq type="default">nano</packagereq>
-       <packagereq type="default">rng-tools</packagereq>
--      <packagereq type="mandatory">rsyslog-gnutls</packagereq>
-       <packagereq type="mandatory">rsyslog</packagereq>
-       <packagereq type="mandatory">rsyslog-relp</packagereq>
-       <packagereq type="default">nmap</packagereq>
-diff --git a/isomaker/config/rpmlist.xml b/isomaker/config/rpmlist.xml
-index 23671de..b2fbe3a 100644
---- a/isomaker/config/rpmlist.xml
-+++ b/isomaker/config/rpmlist.xml
-@@ -1184,7 +1184,6 @@
-         <packagereq>rsyslog</packagereq>
-         <packagereq>rsyslog-crypto</packagereq>
-         <packagereq>rsyslog-elasticsearch</packagereq>
--        <packagereq>rsyslog-gnutls</packagereq>
-         <packagereq>rsyslog-help</packagereq>
-         <packagereq>rsyslog-mmaudit</packagereq>
-         <packagereq>rsyslog-mmjsonparse</packagereq>
-diff --git a/isomaker/config/x86_64/normal.xml b/isomaker/config/x86_64/normal.xml
-index 588e66e..366e32e 100644
---- a/isomaker/config/x86_64/normal.xml
-+++ b/isomaker/config/x86_64/normal.xml
-@@ -915,7 +915,6 @@
-       <packagereq type="optional">freeradius</packagereq>
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
--      <packagereq type="optional">rsyslog-gnutls</packagereq>
-       <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-@@ -941,7 +940,6 @@
-       <packagereq type="optional">freeradius</packagereq>
-       <packagereq type="optional">libreswan</packagereq>
-       <packagereq type="optional">radvd</packagereq>
--      <packagereq type="optional">rsyslog-gnutls</packagereq>
-       <packagereq type="optional">rsyslog</packagereq>
-       <packagereq type="optional">rsyslog-mysql</packagereq>
-       <packagereq type="optional">rsyslog-pgsql</packagereq>
-@@ -1320,7 +1318,6 @@
-       <packagereq type="default">libstoragemgmt</packagereq>
-       <packagereq type="default">nano</packagereq>
-       <packagereq type="default">rng-tools</packagereq>
--      <packagereq type="mandatory">rsyslog-gnutls</packagereq>
-       <packagereq type="mandatory">rsyslog</packagereq>
-       <packagereq type="mandatory">rsyslog-relp</packagereq>
-       <packagereq type="default">nmap</packagereq>
--- 
-2.27.0
-

0002-remove-atlas.patch

@@ -1,53 +0,0 @@
-From ad24eb5ddcbdebea39b6c08804af836eeb78cc2e Mon Sep 17 00:00:00 2001
-From: yeah_wang <wangye70@huawei.com>
-Date: Thu, 25 Mar 2021 19:53:30 +0800
-Subject: [PATCH] remove atlas
-
----
- isomaker/config/aarch64/normal.xml | 2 --
- isomaker/config/x86_64/normal.xml  | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/isomaker/config/aarch64/normal.xml b/isomaker/config/aarch64/normal.xml
-index 35350f7..ec83f09 100644
---- a/isomaker/config/aarch64/normal.xml
-+++ b/isomaker/config/aarch64/normal.xml
-@@ -12,7 +12,6 @@
-     <default>true</default>
-     <uservisible>false</uservisible>
-     <packagelist>
--      <packagereq type="mandatory">atlas-devel</packagereq>
-       <packagereq type="mandatory">audit-libs-devel</packagereq>
-       <packagereq type="mandatory">bzip2-devel</packagereq>
-       <packagereq type="mandatory">c-ares-devel</packagereq>
-@@ -1177,7 +1176,6 @@
-     <default>true</default>
-     <uservisible>true</uservisible>
-     <packagelist>
--      <packagereq type="optional">atlas</packagereq>
-       <packagereq type="optional">units</packagereq>
-       <packagereq type="optional">fftw</packagereq>
-       <packagereq type="optional">fftw-devel</packagereq>
-diff --git a/isomaker/config/x86_64/normal.xml b/isomaker/config/x86_64/normal.xml
-index 588e66e..dfd1b57 100644
---- a/isomaker/config/x86_64/normal.xml
-+++ b/isomaker/config/x86_64/normal.xml
-@@ -12,7 +12,6 @@
-     <default>true</default>
-     <uservisible>false</uservisible>
-     <packagelist>
--      <packagereq type="mandatory">atlas-devel</packagereq>
-       <packagereq type="mandatory">audit-libs-devel</packagereq>
-       <packagereq type="mandatory">bzip2-devel</packagereq>
-       <packagereq type="mandatory">c-ares-devel</packagereq>
-@@ -1179,7 +1178,6 @@
-     <default>true</default>
-     <uservisible>true</uservisible>
-     <packagelist>
--      <packagereq type="optional">atlas</packagereq>
-       <packagereq type="optional">units</packagereq>
-       <packagereq type="optional">fftw</packagereq>
-       <packagereq type="optional">fftw-devel</packagereq>
--- 
-1.8.3.1
-

oemaker.spec

@@ -11,15 +11,18 @@ Summary:        a duilding tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        2.0.0
-Release:        4
+Release:        5
 BuildRoot:      %{_tmppath}/%{name}
+
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source1:        normal_aarch64.xml
+Source2:        normal_x86_64.xml
+Source3:        rpmlist.xml
+
 Requires:       createrepo dnf-plugins-core genisoimage isomd5sum grep bash libselinux-utils libxml2
 Requires:       lorax >= 19.6.78-1
 
-Patch0001:      0001-replace-rsyslog-gnutls-by-rsyslog.patch
+Patch0001:	0001-rename-source-iso.patch
-Patch0002:	0002-remove-atlas.patch
-Patch0003:	0003-rename-source-iso.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -34,6 +37,12 @@ a building tool for ISO cutting
 
 %prep
 %setup -c
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
+cp %{SOURCE1} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/aarch64/normal.xml
+rm -rf  %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
+cp %{SOURCE2} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/x86_64/normal.xml
+rm -rf %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
+cp %{SOURCE3} %{_builddir}/%{name}-%{version}/%{name}/isomaker/config/rpmlist.xml
 cd %{_builddir}/%{name}-%{version}/%{name}
 %autopatch -p1
 
@@ -111,6 +120,11 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Wed Apr 7 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-5
+- ID:NA
+- SUG:NA
+- DESC: change for issue I3DJJW
+
 * Fri Apr 2 2021 miao_kaibo <miaokaibo@outlook.com> - 2.0.0-4
 - ID:NA
 - SUG:NA