From 116a08af97e185683c6879851f8fc11beedc9b07 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Fri, 10 Jan 2020 14:53:36 +0800 Subject: [PATCH] repacked sysfsutils --- ...h => 0000-sysfsutils-2.0.0-class-dup.patch | 0 0000-sysfsutils-2.0.0-redhatify.patch | 19 ------------------- ...ch => 0001-sysfsutils-2.1.0-get_link.patch | 0 ...ch => 0002-sysfsutils-2.1.0-manpages.patch | 0 ...h64.patch => 0003-sysfsutils-aarch64.patch | 0 sysfsutils.spec | 19 +++++++++++++------ 6 files changed, 13 insertions(+), 25 deletions(-) rename 0001-sysfsutils-2.0.0-class-dup.patch => 0000-sysfsutils-2.0.0-class-dup.patch (100%) delete mode 100644 0000-sysfsutils-2.0.0-redhatify.patch rename 0002-sysfsutils-2.1.0-get_link.patch => 0001-sysfsutils-2.1.0-get_link.patch (100%) rename 0003-sysfsutils-2.1.0-manpages.patch => 0002-sysfsutils-2.1.0-manpages.patch (100%) rename 0004-sysfsutils-aarch64.patch => 0003-sysfsutils-aarch64.patch (100%) diff --git a/0001-sysfsutils-2.0.0-class-dup.patch b/0000-sysfsutils-2.0.0-class-dup.patch similarity index 100% rename from 0001-sysfsutils-2.0.0-class-dup.patch rename to 0000-sysfsutils-2.0.0-class-dup.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/0002-sysfsutils-2.1.0-get_link.patch b/0001-sysfsutils-2.1.0-get_link.patch similarity index 100% rename from 0002-sysfsutils-2.1.0-get_link.patch rename to 0001-sysfsutils-2.1.0-get_link.patch diff --git a/0003-sysfsutils-2.1.0-manpages.patch b/0002-sysfsutils-2.1.0-manpages.patch similarity index 100% rename from 0003-sysfsutils-2.1.0-manpages.patch rename to 0002-sysfsutils-2.1.0-manpages.patch diff --git a/0004-sysfsutils-aarch64.patch b/0003-sysfsutils-aarch64.patch similarity index 100% rename from 0004-sysfsutils-aarch64.patch rename to 0003-sysfsutils-aarch64.patch diff --git a/sysfsutils.spec b/sysfsutils.spec index e1a3625..4492363 100644 --- a/sysfsutils.spec +++ b/sysfsutils.spec @@ -1,17 +1,16 @@ 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 +Patch0: 0000-sysfsutils-2.0.0-class-dup.patch +Patch1: 0001-sysfsutils-2.1.0-get_link.patch +Patch2: 0002-sysfsutils-2.1.0-manpages.patch +Patch3: 0003-sysfsutils-aarch64.patch BuildRequires: git gcc chrpath Provides: libsysfs libsysfs%{?_isa} @@ -44,6 +43,8 @@ This contains man files for the using of sysfsutils. %prep %autosetup -n %{name}-%{version} -p1 -S git +sed -i "s#sysfsutils/cmd/GPL#/usr/share/licenses/sysfsutils/GPL#g" COPYING +sed -i "s#sysfsutils/lib/LGPL#/usr/share/licenses/sysfsutils/LGPL#g" COPYING %build %configure --disable-static --libdir=/%{_lib} @@ -81,6 +82,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