From 90ce4d48bc89f4ce1b840443cfde866cd27c1101 Mon Sep 17 00:00:00 2001 From: Dongqi Chen Date: Wed, 12 Feb 2020 14:40:38 +0800 Subject: [PATCH] CentOS 8: Upgrade parted to version 3.2.38 (1)Release Version Upgrade (2)Matching code changes with 3.2.36 to 3.2.38 Story: 2006729 Task: 37658 Depends-On: https://review.opendev.org/#/c/700793/ Change-Id: I9ba09b3941478e3ecfe674a2b8d0295470eda4c7 Signed-off-by: Dongqi Chen --- filesystem/parted/PKG-INFO | 2 +- ...01-Update-package-versioning-for-TIS-format.patch | 6 +++--- .../0001-fix-disable-device-mapper-build-error.patch | 2 +- filesystem/parted/centos/meta_patches/syscalls.patch | 12 ++++++------ filesystem/parted/centos/srpm_path | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/filesystem/parted/PKG-INFO b/filesystem/parted/PKG-INFO index 3f1e93dbf..3912d47e8 100644 --- a/filesystem/parted/PKG-INFO +++ b/filesystem/parted/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: parted -Version: 3.2.36 +Version: 3.2.38 Summary: Disk partition editing/resizing utility Home-page: Author: diff --git a/filesystem/parted/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/filesystem/parted/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 51c4ebf96..123540cfb 100644 --- a/filesystem/parted/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/filesystem/parted/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -17,11 +17,11 @@ index 9316ebe..a79b888 100644 Summary: The GNU disk partition manipulation program Name: parted Version: 3.2 --Release: 36%{?dist} -+Release: 36.el8%{?_tis_dist}.%{tis_patch_ver} +-Release: 38%{?dist} ++Release: 38.el8%{?_tis_dist}.%{tis_patch_ver} License: GPLv3+ Group: Applications/System URL: http://www.gnu.org/software/parted -- -1.8.3.1 +2.7.4 diff --git a/filesystem/parted/centos/meta_patches/0001-fix-disable-device-mapper-build-error.patch b/filesystem/parted/centos/meta_patches/0001-fix-disable-device-mapper-build-error.patch index 655a1f289..44b43ba36 100644 --- a/filesystem/parted/centos/meta_patches/0001-fix-disable-device-mapper-build-error.patch +++ b/filesystem/parted/centos/meta_patches/0001-fix-disable-device-mapper-build-error.patch @@ -12,7 +12,7 @@ diff --git a/SPECS/parted.spec b/SPECS/parted.spec index 183f7d4..9cd6d48 100644 --- a/SPECS/parted.spec +++ b/SPECS/parted.spec -@@ -113,6 +113,9 @@ Patch0088: 0088-linux.c-Use-sys-sysmacros.h-for-major-minor.patch +@@ -115,6 +115,9 @@ Patch0090: 0090-libparted-s390-Re-enabled-virtio-attached-DASD-heuri.patch Patch0099: syscalls.patch diff --git a/filesystem/parted/centos/meta_patches/syscalls.patch b/filesystem/parted/centos/meta_patches/syscalls.patch index d0c099a69..676f9a115 100644 --- a/filesystem/parted/centos/meta_patches/syscalls.patch +++ b/filesystem/parted/centos/meta_patches/syscalls.patch @@ -20,16 +20,16 @@ index 1f453cb..9316ebe 100644 Patch0001: 0001-tests-Try-several-UTF8-locales.patch Patch0002: 0002-maint-post-release-administrivia.patch -@@ -110,6 +111,8 @@ Patch0086: 0086-parted.c-Make-sure-dev_name-is-freed.patch - Patch0087: 0087-t6100-mdraid-partitions-Use-v0.90-metadata-for-the-t.patch - Patch0088: 0088-linux.c-Use-sys-sysmacros.h-for-major-minor.patch +@@ -112,6 +113,8 @@ Patch0088: 0088-linux.c-Use-sys-sysmacros.h-for-major-minor.patch + Patch0089: 0089-t6000-dm-Stop-using-private-lvm-root.patch + Patch0090: 0090-libparted-s390-Re-enabled-virtio-attached-DASD-heuri.patch +Patch0099: syscalls.patch + Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc BuildRequires: e2fsprogs-devel -@@ -179,7 +182,7 @@ git commit -a -m "run iconv" +@@ -181,7 +184,7 @@ git commit -a -m "run iconv" autoreconf autoconf CFLAGS="$RPM_OPT_FLAGS -Wno-unused-but-set-variable"; export CFLAGS @@ -38,7 +38,7 @@ index 1f453cb..9316ebe 100644 # Don't use rpath! %{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool %{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -@@ -198,6 +201,8 @@ V=1 %{__make} %{?_smp_mflags} +@@ -200,6 +203,8 @@ V=1 %{__make} %{?_smp_mflags} %find_lang %{name} @@ -47,7 +47,7 @@ index 1f453cb..9316ebe 100644 %check export LD_LIBRARY_PATH=$(pwd)/libparted/.libs:$(pwd)/libparted/fs/.libs -@@ -234,6 +239,8 @@ fi +@@ -236,6 +241,8 @@ fi %{_libdir}/libparted-fs-resize.so.0.0.1 %{_infodir}/parted.info.gz diff --git a/filesystem/parted/centos/srpm_path b/filesystem/parted/centos/srpm_path index 4f8410178..3de2ae6d7 100644 --- a/filesystem/parted/centos/srpm_path +++ b/filesystem/parted/centos/srpm_path @@ -1 +1 @@ -mirror:Source/parted-3.2-36.el8.src.rpm +mirror:Source/parted-3.2-38.el8.src.rpm