!8 repackage sysfsutils

Merge pull request !8 from hy/master

0000-sysfsutils-2.0.0-redhatify.patch

@@ -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

9000-sysutils-modify-GPL-path-written-in-COPYING.patch

@@ -0,0 +1,31 @@
+From bcb67a67348ebe154d6bf2d426e0a0b5c18630be Mon Sep 17 00:00:00 2001
+From: Huangzheng <huangzheng22@huawei.com>
+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 <huangzheng22@huawei.com>
+---
+ 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

sysfsutils.spec

@@ -1,18 +1,19 @@
 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
 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
 Patch4:      0004-sysfsutils-aarch64.patch
 
+Patch9000:   9000-sysutils-modify-GPL-path-written-in-COPYING.patch
+
 BuildRequires: git gcc chrpath
 Provides:      libsysfs libsysfs%{?_isa}
 Obsoletes:     libsysfs
@@ -81,11 +82,17 @@ chrpath -d  $(find $RPM_BUILD_ROOT -name systool)
 
 
 %changelog
+* Fri Jan 10 2020 Huangzheng <huangzheng22@huawei.com> - 2.1.0-28
+- Type:enhancemnet
+- ID:NA
+- SUG:restart
+- DESC:repackaged
+
 * Tue Aug 20 2019 zhanghaibo <ted.zhang@huawei.com> - 2.1.0-27
 - Type:enhancemnet
 - ID:NA
 - SUG:NA
-- DESCi:openEuler Debranding
+- DESC:openEuler Debranding
 
 * Tue Aug 20 2019 huangzheng <huangzheng22@huawei.com> - 2.1.0-26
 - Type:enhancement
@@ -97,5 +104,5 @@ chrpath -d  $(find $RPM_BUILD_ROOT -name systool)
 - Type:bugfix
 - ID:NA
 - SUG:restart
-- DESCi:remove rpath
+- DESC:remove rpath
 - Package init