Update the SPDX license list to v1.20

2 files changed, 96 insertions, 4 deletions

diff --git a/libappstream-builder/asb-package-rpm.c b/libappstream-builder/asb-package-rpm.c
index 4c9f1d1..fe12753 100644
--- a/libappstream-builder/asb-package-rpm.c
+++ b/libappstream-builder/asb-package-rpm.c
@@ -153,6 +153,7 @@ asb_package_rpm_set_license (AsbPackage *pkg, const gchar *license)
 		{ "SPL",			"SPL-1.0" },
 		{ "zlib",			"Zlib" },
 		{ "ZPLv2.0",			"ZPL-2.0" },
+		{ "Unlicense",			"CC0-1.0" },
 		{ NULL, NULL } };
 
 	/* this isn't supposed to happen */
diff --git a/libappstream-glib/as-license-ids.txt b/libappstream-glib/as-license-ids.txt
index 330cb93..44cabf1 100644
--- a/libappstream-glib/as-license-ids.txt
+++ b/libappstream-glib/as-license-ids.txt
@@ -1,40 +1,61 @@
-# this file contains the list of known licenses from http://spdx.org/licenses/
+# the list of licenses from http://spdx.org/licenses/ version: 1.20
+Glide
+Abstyles
 AFL-1.1
 AFL-1.2
 AFL-2.0
 AFL-2.1
 AFL-3.0
+AMPAS
 APL-1.0
+Adobe-Glyph
+APAFML
+Adobe-2006
+AGPL-1.0
+Afmparse
 Aladdin
+ADSL
+AMDPLPA
 ANTLR-PD
 Apache-1.0
 Apache-1.1
 Apache-2.0
+AML
 APSL-1.0
 APSL-1.1
 APSL-1.2
 APSL-2.0
 Artistic-1.0
-Artistic-1.0-cl8
 Artistic-1.0-Perl
+Artistic-1.0-cl8
 Artistic-2.0
 AAL
+Bahyph
+Barr
+Beerware
 BitTorrent-1.0
 BitTorrent-1.1
 BSL-1.0
+Borceux
 BSD-2-Clause
 BSD-2-Clause-FreeBSD
 BSD-2-Clause-NetBSD
 BSD-3-Clause
 BSD-3-Clause-Clear
 BSD-4-Clause
+BSD-Protection
+BSD-3-Clause-Attribution
 BSD-4-Clause-UC
+bzip2-1.0.5
+bzip2-1.0.6
+Caldera
 CECILL-1.0
 CECILL-1.1
 CECILL-2.0
 CECILL-B
 CECILL-C
 ClArtistic
+MIT-CMU
 CNRI-Python
 CNRI-Python-GPL-Compatible
 CPOL-1.02
@@ -48,45 +69,67 @@ CC-BY-1.0
 CC-BY-2.0
 CC-BY-2.5
 CC-BY-3.0
+CC-BY-4.0
 CC-BY-ND-1.0
 CC-BY-ND-2.0
 CC-BY-ND-2.5
 CC-BY-ND-3.0
+CC-BY-ND-4.0
 CC-BY-NC-1.0
 CC-BY-NC-2.0
 CC-BY-NC-2.5
 CC-BY-NC-3.0
+CC-BY-NC-4.0
 CC-BY-NC-ND-1.0
 CC-BY-NC-ND-2.0
 CC-BY-NC-ND-2.5
 CC-BY-NC-ND-3.0
+CC-BY-NC-ND-4.0
 CC-BY-NC-SA-1.0
 CC-BY-NC-SA-2.0
 CC-BY-NC-SA-2.5
 CC-BY-NC-SA-3.0
+CC-BY-NC-SA-4.0
 CC-BY-SA-1.0
 CC-BY-SA-2.0
 CC-BY-SA-2.5
 CC-BY-SA-3.0
+CC-BY-SA-4.0
 CC0-1.0
+Crossword
 CUA-OPL-1.0
+Cube
 D-FSL-1.0
+diffmark
 WTFPL
+DOC
+Dotseqn
+DSDP
+dvipdfm
 EPL-1.0
 eCos-2.0
 ECL-1.0
 ECL-2.0
+eGenix
 EFL-1.0
 EFL-2.0
+MIT-advertising
+MIT-enna
 Entessa
 ErlPL-1.1
 EUDatagrid
 EUPL-1.0
 EUPL-1.1
+Eurosym
 Fair
+MIT-feh
 Frameworx-1.0
 FTL
-AGPL-1.0
+FSFUL
+FSFULLR
+Giftware
+GL2PS
+Glulxe
 AGPL-3.0
 GFDL-1.1
 GFDL-1.2
@@ -110,44 +153,65 @@ LGPL-3.0
 LGPL-3.0+
 LGPL-2.0
 LGPL-2.0+
+gnuplot
 gSOAP-1.3b
+HaskellReport
 HPND
 IBM-pibs
 IPL-1.0
+ImageMagick
+iMatix
 Imlib2
 IJG
+Intel-ACPI
 Intel
 IPA
 ISC
+JasPer-2.0
 JSON
 LPPL-1.3a
 LPPL-1.0
 LPPL-1.1
 LPPL-1.2
 LPPL-1.3c
+Latex2e
+BSD-3-Clause-LBNL
+Leptonica
 Libpng
+libtiff
 LPL-1.02
 LPL-1.0
+MakeIndex
+MTLL
 MS-PL
 MS-RL
 MirOS
+MITNFA
 MIT
 Motosoto
 MPL-1.0
 MPL-1.1
 MPL-2.0
 MPL-2.0-no-copyleft-exception
+mpich2
 Multics
+Mup
 NASA-1.3
 Naumen
 NBPL-1.0
+NetCDF
 NGPL
 NOSL
 NPL-1.0
 NPL-1.1
+Newsletr
+NLPL
 Nokia
 NPOSL-3.0
+Noweb
+NRL
 NTP
+Nunit
 OCLC-2.0
 ODbL-1.0
 PDDL-1.0
@@ -167,8 +231,10 @@ OLDAP-2.4
 OLDAP-2.5
 OLDAP-2.6
 OLDAP-2.7
+OML
 OPL-1.0
 OSL-1.0
+OSL-1.1
 OSL-2.0
 OSL-2.1
 OSL-3.0
@@ -176,9 +242,14 @@ OLDAP-2.8
 OpenSSL
 PHP-3.0
 PHP-3.01
+Plexus
 PostgreSQL
+psfrag
+psutils
 Python-2.0
 QPL-1.0
+Qhull
+Rdisc
 RPSL-1.0
 RPL-1.1
 RPL-1.5
@@ -186,6 +257,9 @@ RHeCos-1.1
 RSCPL
 Ruby
 SAX-PD
+Saxpath
+SCEA
+SWL
 SGI-B-1.0
 SGI-B-1.1
 SGI-B-2.0
@@ -193,24 +267,41 @@ OFL-1.0
 OFL-1.1
 SimPL-2.0
 Sleepycat
+SNIA
 SMLNJ
+StandardML-NJ
 SugarCRM-1.1.3
 SISSL
 SISSL-1.2
 SPL-1.0
 Watcom-1.0
+TCL
+Unlicense
+TMate
+TORQUE-1.1
+TOSL
+Unicode-TOU
 NCSA
+Vim
+VOSTROM
 VSL-1.0
 W3C
+Wsuipa
 WXwindows
 Xnet
 X11
+Xerox
 XFree86-1.1
+xinetd
+xpp
+XSkat
 YPL-1.0
 YPL-1.1
+Zed
+Zend-2.0
 Zimbra-1.3
 Zlib
+zlib-acknowledgement
 ZPL-1.1
 ZPL-2.0
 ZPL-2.1
-Unlicense