diff --git a/0000-sysfsutils-2.0.0-redhatify.patch b/0000-sysfsutils-2.0.0-redhatify.patch deleted file mode 100644 index af0d16af3204e9fc4245fbf0155527d1824e3789..0000000000000000000000000000000000000000 --- a/0000-sysfsutils-2.0.0-redhatify.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nurp sysfsutils-1.2.0.bak/COPYING sysfsutils-1.2.0/COPYING ---- sysfsutils-1.2.0.bak/COPYING 2004-09-13 08:45:15.000000000 -0500 -+++ sysfsutils-1.2.0/COPYING 2004-10-11 13:05:00.483795976 -0500 -@@ -1,11 +1,10 @@ - --The commands and utilities under the "test" directory are licensed under the --GNU General Public License (GPL) Version 2, June 1991. The full text of the --GPL is located at: -+The commands and utilities are licensed under the GNU General Public License -+(GPL) Version 2, June 1991. The full text of the GPL is located at: - --sysfsutils/cmd/GPL -+/usr/share/doc/sysfsutils-{version}/GPL - - The sysfs library is licensed under the GNU Lesser Public License (LGPL) - Version 2.1, February 1999. The full text of the LGPL is located at: - --sysfsutils/lib/LGPL -+/usr/share/doc/sysfsutils-{version}/LGPL diff --git a/0000-sysfsutils-2.1.0-modify-COPYING.patch b/0000-sysfsutils-2.1.0-modify-COPYING.patch new file mode 100644 index 0000000000000000000000000000000000000000..38ddfda18af2b37bf3222218523fd580b33dfbeb --- /dev/null +++ b/0000-sysfsutils-2.1.0-modify-COPYING.patch @@ -0,0 +1,31 @@ +From bcb67a67348ebe154d6bf2d426e0a0b5c18630be Mon Sep 17 00:00:00 2001 +From: Huangzheng +Date: Fri, 10 Jan 2020 16:27:37 +0800 +Subject: [PATCH] sysfsutils: modify GPL path written in COPYING + +Openeuler has packaged the GPL and LGPL into usr/share/licenses/sysfsutils, +so we need modify COPYING file. + +Signed-off-by: Huangzheng +--- + COPYING | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/COPYING b/COPYING +index 39cac23..c0b5638 100644 +--- a/COPYING ++++ b/COPYING +@@ -3,9 +3,9 @@ The commands and utilities under the "test" directory are licensed under the + GNU General Public License (GPL) Version 2, June 1991. The full text of the + GPL is located at: + +-sysfsutils/cmd/GPL ++/usr/share/licenses/sysfsutils/GPL + + The sysfs library is licensed under the GNU Lesser Public License (LGPL) + Version 2.1, February 1999. The full text of the LGPL is located at: + +-sysfsutils/lib/LGPL ++/usr/share/licenses/sysfsutils/LGPL +-- +2.19.1 diff --git a/sysfsutils.spec b/sysfsutils.spec index e1a3625c31fd997adc2019cbc0a73213f187d676..b72bc91080c063a6734943ee855a024d47feb311 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -1,13 +1,13 @@ Name: sysfsutils Version: 2.1.0 -Release: 27 +Release: 28 Summary: A set of utilities for interfacing with sysfs License: GPLv2 and LGPLv2+ URL: http://sourceforge.net/projects/linux-diag/ Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Patch0: 0000-sysfsutils-2.0.0-redhatify.patch +Patch0: 0000-sysfsutils-2.1.0-modify-COPYING.patch Patch1: 0001-sysfsutils-2.0.0-class-dup.patch Patch2: 0002-sysfsutils-2.1.0-get_link.patch Patch3: 0003-sysfsutils-2.1.0-manpages.patch @@ -81,6 +81,12 @@ chrpath -d $(find $RPM_BUILD_ROOT -name systool) %changelog +* Fri Jan 10 2020 openEuler Buildteam - 2.1.0-28 +- Type:enhancemnet +- ID:NA +- SUG:restart +- DESCi:repackaged + * Tue Aug 20 2019 zhanghaibo - 2.1.0-27 - Type:enhancemnet - ID:NA