rpm/rpmlint
SHA256
1
0
Fork 0
forked from pool/rpmlint
Code Pull Requests Activity

Accepting request 578225 from home:coolo:branches:openSUSE:Factory

Browse Source 
- allow more deprecated licenses to unbreak ring1+2

OBS-URL: https://build.opensuse.org/request/show/578225
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=571
This commit is contained in:
Dirk Mueller 2018-02-20 10:07:31 +00:00 committed by Git OBS Bridge
parent fdb8ab6dfe
commit 0b2848951f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rpmlint.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 20 05:37:21 UTC 2018 - coolo@suse.com
- allow more deprecated licenses to unbreak ring1+2
-------------------------------------------------------------------
Sun Feb 18 14:26:09 UTC 2018 - dmueller@suse.com

4
rpmlint.spec
View File

@ -144,7 +144,9 @@ cut '-d ' -f1 %{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes
sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config
done
# add some deprecated licenses we allow for now
for l in AGPL-3.0 GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do
for l in AGPL-3.0 AGPL-3.0+ GFDL-1.1 GFDL-1.1+ GFDL-1.2 GFDL-1.2+ GFDL-1.3 GFDL-1.3+ GPL-3.0-with-GCC-exception \
GPL-2.0-with-classpath-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \
GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do
sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config
done
install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/