From d09032d960db7380e53752a5b0eeed0a26b6290d Mon Sep 17 00:00:00 2001 From: chenyx2012 <975102023@qq.com> Date: Thu, 28 Jul 2022 02:20:12 +0000 Subject: [PATCH 1/2] License compliance rectification --- openEuler-latest-release.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openEuler-latest-release.spec b/openEuler-latest-release.spec index 71802df..3a210aa 100644 --- a/openEuler-latest-release.spec +++ b/openEuler-latest-release.spec @@ -1,6 +1,6 @@ Name: openEuler-latest-release Summary: System information like kernelversion, openeulerversion, gccversion, openjdkversion and compile time -License: GPL +License: GPL-1.0-or-later Group: System/Config Version: 1.0 %ifarch aarch64 @@ -55,3 +55,5 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog +* Thu Jul 28 2022 Chenyx - 1.0 +- License compliance rectification \ No newline at end of file -- Gitee From 9527d6dff57b2a1fd16170ac1d13f41290872541 Mon Sep 17 00:00:00 2001 From: chenyx2012 <975102023@qq.com> Date: Mon, 8 Aug 2022 07:54:06 +0000 Subject: [PATCH 2/2] License compliance rectification --- openEuler-latest-release.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/openEuler-latest-release.spec b/openEuler-latest-release.spec index 3a210aa..b1ff461 100644 --- a/openEuler-latest-release.spec +++ b/openEuler-latest-release.spec @@ -3,11 +3,7 @@ Summary: System information like kernelversion, openeulerversion, gccvers License: GPL-1.0-or-later Group: System/Config Version: 1.0 -%ifarch aarch64 -Release: %(date +%s -d "$(grep "compiletime" %{_sourcedir}/isopackage_arm64.sdf | cut -d '=' -f2 | sed 's/-/ /3' | sed 's/-/:/3' | sed 's/-/:/3')")%(grep "openeulerversion" %{_sourcedir}/isopackage_arm64.sdf | cut -d '-' -f2) -%else -Release: %(date +%s -d "$(grep "compiletime" %{_sourcedir}/isopackage.sdf | cut -d '=' -f2 | sed 's/-/ /3' | sed 's/-/:/3' | sed 's/-/:/3')")%(grep "openeulerversion" %{_sourcedir}/isopackage.sdf | cut -d '-' -f2) -%endif +Release: 1 Source1: isopackage.sdf Source2: isopackage_arm64.sdf BuildRoot: %{_tmppath}/%{name}-%{version} @@ -55,5 +51,5 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog -* Thu Jul 28 2022 Chenyx - 1.0 +* Thu Jul 28 2022 Chenyx - 1.0-1 - License compliance rectification \ No newline at end of file -- Gitee