From a9ee2731708e247d363c7dc802e2d9198f80b3b4 Mon Sep 17 00:00:00 2001
From: yixiangzhike <yixiangzhike007@163.com>
Date: Fri, 10 Oct 2025 10:59:57 +0800
Subject: [PATCH] compatible with single-line no-newline configuration

---
 ...single-line-no-newline-configuration.patch | 34 +++++++++++++++++++
 oemaker.spec                                  |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 backport-Compatible-with-single-line-no-newline-configuration.patch

diff --git a/backport-Compatible-with-single-line-no-newline-configuration.patch b/backport-Compatible-with-single-line-no-newline-configuration.patch
new file mode 100644
index 0000000..6c83ec1
--- /dev/null
+++ b/backport-Compatible-with-single-line-no-newline-configuration.patch
@@ -0,0 +1,34 @@
+From e84f874825bc59ed32a610b1fff2cdc770702e4e Mon Sep 17 00:00:00 2001
+From: yixiangzhike <yixiangzhike007@163.com>
+Date: Fri, 26 Sep 2025 11:11:39 +0800
+Subject: [PATCH] Compatible with single-line no-newline configuration
+
+---
+ isocut/isocut.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/isocut/isocut.py b/isocut/isocut.py
+index a8cb596..7a3039f 100644
+--- a/isocut/isocut.py
++++ b/isocut/isocut.py
+@@ -384,7 +384,7 @@ def select_rpm():
+     rpm_list = ""
+     for line in rpm_list_file:
+         if not (line is None or line.strip() == ""):
+-            rpm_list += " %s" % line[:-1].strip()
++            rpm_list += " %s" % line.strip()
+     cmd = "yumdownloader -y --resolve -c {0} --installroot {1} --destdir {2}/{3} {4}".format(
+         ICONFIG.yum_conf, ICONFIG.cache_path, ICONFIG.temp_path_new_image,
+         EXCLUDE_DIR_PACKAGES, rpm_list)
+@@ -436,7 +436,7 @@ def regen_repodata():
+             if line is None or line.strip() == "":
+                 continue
+             pack = ET.SubElement(packlist, 'packagereq', type='default')
+-            pack.text = line[:-1].strip()
++            pack.text = line.strip()
+             if os.uname()[-1].strip() == 'x86_64':
+                 pack.text = pack.text.split(".x86_64")[0]
+             elif os.uname()[-1].strip() == 'aarch64':
+-- 
+2.43.0
+
diff --git a/oemaker.spec b/oemaker.spec
index b929e24..2e5a1c5 100644
--- a/oemaker.spec
+++ b/oemaker.spec
@@ -15,7 +15,7 @@ Summary:        a building tool for DVD ISO making and ISO cutting
 License:        Mulan PSL v2
 Group:          System/Management
 Version:        3.2.0
-Release:        13
+Release:        14
 BuildRoot:      %{_tmppath}/%{name}
 
 Source:         https://gitee.com/openeuler/oemaker/repository/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -44,6 +44,7 @@ Requires:       xorriso
 Patch0001:      0001-bugfix-IABY7K.patch
 Patch0002:      0001-fix-livecd-grub2-efi.cfg-not-found.patch
 Patch0003:	enable-efi-boot-for-loongarch64.patch
+Patch0004:      backport-Compatible-with-single-line-no-newline-configuration.patch
 
 %description
 a building tool for DVD ISO making and ISO cutting
@@ -215,6 +216,9 @@ rm -rf %{buildroot}
 rm -rf $RPM_BUILD_DIR/%{name}
 
 %changelog
+* Fri Oct 10 2025 yixiangzhike <yixiangzhike007@163.com> - 3.2.0-14
+- compatible with single-line no-newline configuration
+
 * Thu Apr 10 2025 wangmian <wangmian19@h-partners.com> - 3.2.0-13
 - update 24.03LTS-SP1 rpmlist.xml
 
-- 
Gitee