diff --git a/0001-bugfix-IABY7K.patch b/0001-bugfix-IABY7K.patch deleted file mode 100644 index e559a9def5e666079163ffe1c29cd016247c779a..0000000000000000000000000000000000000000 --- a/0001-bugfix-IABY7K.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 52f60354b4d48a0b3c2a25ddabb10a47073bfb0c Mon Sep 17 00:00:00 2001 -From: wangchong1995924 <15229716099@163.com> -Date: Wed, 10 Jul 2024 15:28:00 +0800 -Subject: [PATCH] fix issue IABY7K - - -diff --git a/isomaker/rpm.sh b/isomaker/rpm.sh -index a9efe4b..b2ba4de 100644 ---- a/isomaker/rpm.sh -+++ b/isomaker/rpm.sh -@@ -185,7 +185,7 @@ function get_desktop_rpms() - - function get_everything_rpms() - { -- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo" | grep -v "debugsource" > ava_every_lst -+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "\.noarch|\.${ARCH}" | grep -v "debuginfo\." | grep -v "debugsource\." > ava_every_lst - parse_rpmlist_xml "exclude" - cat parsed_rpmlist_exclude - if [ -s parsed_rpmlist_exclude ];then -@@ -259,7 +259,7 @@ function everything_source_rpms_download() - function everything_debug_rpms_download() - { - mkdir ${EVERY_DEBUG_DIR} -- yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo|debugsource" > ava_debug_lst -+ yum list --installroot="${BUILD}"/tmp --available | awk '{print $1}' | grep -E "debuginfo\.|debugsource\." > ava_debug_lst - parse_rpmlist_xml "everything_debug_exclude" - cat parsed_rpmlist_everything_debug_exclude - if [ -s parsed_rpmlist_everything_debug_exclude ];then --- -2.27.0 - diff --git a/oemaker-3.1.0.tar.gz b/oemaker-3.1.0.tar.gz deleted file mode 100644 index 2cdf6e47b49a6f0397ecb26117b639c3eeb61f66..0000000000000000000000000000000000000000 Binary files a/oemaker-3.1.0.tar.gz and /dev/null differ diff --git a/oemaker-3.2.0.tar.gz b/oemaker-3.2.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..d7eb20e5133ea9021b47872eede8de4307c66a96 Binary files /dev/null and b/oemaker-3.2.0.tar.gz differ diff --git a/oemaker.spec b/oemaker.spec index be3eadbb55c6f35812a3c71dc846c381720e26c6..9143487e127477fa26b43ac5eac796b202427ae1 100644 --- a/oemaker.spec +++ b/oemaker.spec @@ -10,8 +10,8 @@ Name: oemaker Summary: a building tool for DVD ISO making and ISO cutting License: Mulan PSL v2 Group: System/Management -Version: 3.1.0 -Release: 8 +Version: 3.2.0 +Release: 1 BuildRoot: %{_tmppath}/%{name} Source: https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -27,7 +27,6 @@ Requires: createrepo dnf-plugins-core genisoimage isomd5sum grep bash libs Requires: lorax >= 19.6.78-1 # Patch here -Patch0001: 0001-bugfix-IABY7K.patch %description a building tool for DVD ISO making and ISO cutting @@ -173,6 +172,11 @@ rm -rf %{buildroot} rm -rf $RPM_BUILD_DIR/%{name} %changelog +* Mon Sep 9 2024 xiangyuning - 3.2.0-1 +- ID:NA +- SUG:NA +- upgrade to 3.2.0 + * Wed Jul 10 2024 wangchong - 3.1.0-8 - ID:NA - SUG:NA