From 3fad7f6c6c5ee6760490df3d09f7660f0c7600a023f2c92575118dcab82901bb Mon Sep 17 00:00:00 2001 From: YaST Team Bot Date: Wed, 22 Aug 2018 08:24:21 +0000 Subject: [PATCH] - Switched license in spec file from SPDX2 to SPDX3 format. - Changed dir of COPYING file. OBS-URL: https://build.opensuse.org/package/show/YaST:Head/yast2-firewall?expand=0&rev=213 --- yast2-firewall-4.0.26.tar.bz2 | 4 ++-- yast2-firewall.changes | 6 ++++++ yast2-firewall.spec | 9 +++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/yast2-firewall-4.0.26.tar.bz2 b/yast2-firewall-4.0.26.tar.bz2 index 0cf9551..97695a4 100644 --- a/yast2-firewall-4.0.26.tar.bz2 +++ b/yast2-firewall-4.0.26.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef4a3c6a2c4d5bfd621cd7a9f0af90115e0a0d013bb760edf9f5c0f259624467 -size 58277 +oid sha256:d191ad3004f97aeadab901823691f6080e4af0e15ee3e1bbc8a90f0051053c8f +size 58388 diff --git a/yast2-firewall.changes b/yast2-firewall.changes index 6993d58..e345138 100644 --- a/yast2-firewall.changes +++ b/yast2-firewall.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 20 16:21:38 CEST 2018 - schubi@suse.de + +- Switched license in spec file from SPDX2 to SPDX3 format. +- Changed dir of COPYING file. + ------------------------------------------------------------------- Thu Jun 28 15:43:21 CEST 2018 - schubi@suse.de diff --git a/yast2-firewall.spec b/yast2-firewall.spec index a4e4723..9b48a5b 100644 --- a/yast2-firewall.spec +++ b/yast2-firewall.spec @@ -49,7 +49,7 @@ BuildArch: noarch Requires: yast2-ruby-bindings >= 1.0.0 Summary: YaST2 - Firewall Configuration -License: GPL-2.0 +License: GPL-2.0-only Group: System/YaST %description @@ -66,6 +66,11 @@ rake test:unit %install rake install DESTDIR="%{buildroot}" +# Remove the license from the /usr/share/doc/packages directory, +# it is also included in the /usr/share/licenses directory by using +# the %license tag. +rm -f $RPM_BUILD_ROOT/%{yast_docdir}/COPYING + %files %defattr(-,root,root) %{yast_dir}/clients/*.rb @@ -75,7 +80,7 @@ rake install DESTDIR="%{buildroot}" %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/firewall.rnc -%doc COPYING +%license COPYING %doc README.md %doc CONTRIBUTING.md