diff --git a/0001-add-loongarch64-support-for-blivet.patch b/1000-add-loongarch64-support-not-upstream-modified-files.patch similarity index 100% rename from 0001-add-loongarch64-support-for-blivet.patch rename to 1000-add-loongarch64-support-not-upstream-modified-files.patch diff --git a/blivet-3.4.2-sw.patch b/1001-add-sw_64-support-not-upstream-modified-files.patch similarity index 100% rename from blivet-3.4.2-sw.patch rename to 1001-add-sw_64-support-not-upstream-modified-files.patch diff --git a/python-blivet.spec b/python-blivet.spec index bd27b1f7ff5d493cbfd3c1081216726a91dbcbc9..9762a32d5d82b51189173200013447b1f866b150 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -3,7 +3,7 @@ Name: python-blivet Version: 3.4.2 -Release: 7 +Release: 8 Epoch: 1 Summary: A python module for system storage configuration License: LGPLv2+ @@ -19,19 +19,16 @@ BuildRequires: python2-devel python2-setuptools Patch0: 0001-force-lvm-plugin.patch Patch1: fix-the-long-hostname.patch -Patch9001: 0001-Make-sure-we-mount-the-top-level-subvolume-when-moun.patch -%ifarch sw_64 -Patch9002: blivet-3.4.2-sw.patch -%endif -patch9003: Incomplete-Chineseization-of-disk-mount.patch + +patch1000: 1000-add-loongarch64-support-not-upstream-modified-files.patch +patch1001: 1001-add-sw_64-support-not-upstream-modified-files.patch patch6001: backport-Exclude-unusable-disks-from-PartitionFactory-1.patch patch6002: backport-Exclude-unusable-disks-from-PartitionFactory-2.patch -%if 0%(test `uname -m` == "loongarch64" && echo 1) -Patch6003: 0001-add-loongarch64-support-for-blivet.patch -%endif -patch6004: backport-Add-a-basic-read-only-support-for-UDF-filesystem.patch +patch6003: backport-Add-a-basic-read-only-support-for-UDF-filesystem.patch +Patch9001: 0001-Make-sure-we-mount-the-top-level-subvolume-when-moun.patch +patch9002: Incomplete-Chineseization-of-disk-mount.patch %description The python-blivet package is a python module for examining and modifying storage configuration. @@ -131,6 +128,9 @@ make PYTHON=%{__python2} DESTDIR=%{buildroot} install %doc README.md %changelog +* Sat Aug 12 2023 panchenbo - 1:3.4.2-8 +- turn on sw_64 loongarch for all arch reorder patchs + * Mon Feb 13 2023 hanhuihui - 1:3.4.2-7 - Type:bugfix - ID:NA