From 9e42f61b0560a70a1c14cce300ae3071c6764f8b Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Fri, 10 Jan 2020 16:50:44 +0800 Subject: [PATCH 1/5] repack sysfsutils --- 0000-sysfsutils-2.0.0-redhatify.patch | 19 --------------- 0000-sysfsutils-2.1.0-modify-COPYING.patch | 28 ++++++++++++++++++++++ sysfsutils.spec | 10 ++++++-- 3 files changed, 36 insertions(+), 21 deletions(-) delete mode 100644 0000-sysfsutils-2.0.0-redhatify.patch create mode 100644 0000-sysfsutils-2.1.0-modify-COPYING.patch diff --git a/0000-sysfsutils-2.0.0-redhatify.patch b/0000-sysfsutils-2.0.0-redhatify.patch deleted file mode 100644 index af0d16a..0000000 --- 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 0000000..d0cbd7d --- /dev/null +++ b/0000-sysfsutils-2.1.0-modify-COPYING.patch @@ -0,0 +1,28 @@ +From 9fe3bde28520222039c7f41b4ca610fafbe9db89 Mon Sep 17 00:00:00 2001 +From: openEuler Buildteam +Date: Fri, 10 Jan 2020 16:27:37 +0800 +Subject: [PATCH] modify COPYING + +--- + 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 e1a3625..b72bc91 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 -- Gitee From f800cb2d891d7e3fffa570fc89f4a1ddb65c6e9f Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Fri, 10 Jan 2020 17:59:53 +0800 Subject: [PATCH 2/5] modify for pathch's standard --- 0000-sysfsutils-2.1.0-modify-COPYING.patch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/0000-sysfsutils-2.1.0-modify-COPYING.patch b/0000-sysfsutils-2.1.0-modify-COPYING.patch index d0cbd7d..38ddfda 100644 --- a/0000-sysfsutils-2.1.0-modify-COPYING.patch +++ b/0000-sysfsutils-2.1.0-modify-COPYING.patch @@ -1,8 +1,12 @@ -From 9fe3bde28520222039c7f41b4ca610fafbe9db89 Mon Sep 17 00:00:00 2001 -From: openEuler Buildteam +From bcb67a67348ebe154d6bf2d426e0a0b5c18630be Mon Sep 17 00:00:00 2001 +From: Huangzheng Date: Fri, 10 Jan 2020 16:27:37 +0800 -Subject: [PATCH] modify COPYING +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(-) @@ -25,4 +29,3 @@ index 39cac23..c0b5638 100644 +/usr/share/licenses/sysfsutils/LGPL -- 2.19.1 - -- Gitee From f0e290e2a404c5c3c447521366d2dc76867f2d57 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Fri, 10 Jan 2020 18:13:04 +0800 Subject: [PATCH 3/5] modify mail address --- sysfsutils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysfsutils.spec b/sysfsutils.spec index b72bc91..b2f6885 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -81,7 +81,7 @@ chrpath -d $(find $RPM_BUILD_ROOT -name systool) %changelog -* Fri Jan 10 2020 openEuler Buildteam - 2.1.0-28 +* Fri Jan 10 2020 Huangzheng - 2.1.0-28 - Type:enhancemnet - ID:NA - SUG:restart -- Gitee From a02a9aff9e4236ac65450dab868ef08c1eca2548 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Fri, 10 Jan 2020 19:03:38 +0800 Subject: [PATCH 4/5] rename patch --- ...ch => 0000-sysutils-modify-GPL-path-written-in-COPYING.patch | 0 sysfsutils.spec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename 0000-sysfsutils-2.1.0-modify-COPYING.patch => 0000-sysutils-modify-GPL-path-written-in-COPYING.patch (100%) diff --git a/0000-sysfsutils-2.1.0-modify-COPYING.patch b/0000-sysutils-modify-GPL-path-written-in-COPYING.patch similarity index 100% rename from 0000-sysfsutils-2.1.0-modify-COPYING.patch rename to 0000-sysutils-modify-GPL-path-written-in-COPYING.patch diff --git a/sysfsutils.spec b/sysfsutils.spec index b2f6885..f667e1f 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -7,7 +7,7 @@ URL: http://sourceforge.net/projects/linux-diag/ Source0: http://prdownloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Patch0: 0000-sysfsutils-2.1.0-modify-COPYING.patch +Patch0: 0000-sysutils-modify-GPL-path-written-in-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 -- Gitee From 9de0d048f6c47ac78403f745f6d842aeee0015b0 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Fri, 10 Jan 2020 19:51:23 +0800 Subject: [PATCH 5/5] modify pathch for a space needed --- 0000-sysutils-modify-GPL-path-written-in-COPYING.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0000-sysutils-modify-GPL-path-written-in-COPYING.patch b/0000-sysutils-modify-GPL-path-written-in-COPYING.patch index 38ddfda..a66bc71 100644 --- a/0000-sysutils-modify-GPL-path-written-in-COPYING.patch +++ b/0000-sysutils-modify-GPL-path-written-in-COPYING.patch @@ -16,7 +16,7 @@ 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 + GNU General Public License (GPL) Version 2, June 1991. The full text of the GPL is located at: -sysfsutils/cmd/GPL -- Gitee