summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2008-05-20 15:50:08 -0400
committerTodd Zullinger <tmz@pobox.com>2008-05-20 15:50:08 -0400
commit53dcc475b90a3bafe0fbafbc3f821c1eabbcdffe (patch)
tree9cec01e912a61e8ae957303848ea931a0ecb1e7f
parentb434be97ebd045c454580ab248755a035eb23476 (diff)
downloadlicense-check-53dcc475b90a3bafe0fbafbc3f821c1eabbcdffe.tar.gz
license-check-53dcc475b90a3bafe0fbafbc3f821c1eabbcdffe.tar.xz
license-check-53dcc475b90a3bafe0fbafbc3f821c1eabbcdffe.zip
Sync license list with rev 0.83 (Wiki revision 131)
-rw-r--r--rpmlint.config14
1 files changed, 12 insertions, 2 deletions
diff --git a/rpmlint.config b/rpmlint.config
index 2c0248f..3f186a5 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -28,7 +28,7 @@ setOption("DanglingSymlinkExceptions", (
setOption("ValidLicenses", (
# These are the short names for all of the Fedora approved licenses.
# The master list is kept here: http://fedoraproject.org/wiki/Licensing
- # Last synced with Revision 0.73 (Wiki revision 116) of that page.
+ # Last synced with Revision 0.83 (Wiki revision 131) of that page.
'Adobe',
'ADSL',
'AFL',
@@ -52,6 +52,7 @@ setOption("ValidLicenses", (
'BSD with advertising',
'CeCILL',
'CDDL',
+ 'CPAL',
'CPL',
'Condor',
'Copyright only',
@@ -63,6 +64,7 @@ setOption("ValidLicenses", (
'EFL 2.0',
'EFL 2.0+',
'EU Datagrid',
+ 'Fair',
'FTL',
'Giftware',
'Glide',
@@ -111,6 +113,7 @@ setOption("ValidLicenses", (
'NetCDF',
'NGPL',
'NOSL',
+ 'Naumen',
'Netscape',
'Nokia',
'OpenLDAP',
@@ -139,12 +142,14 @@ setOption("ValidLicenses", (
'SPL',
'TCL',
'UCD',
+ 'VOSTROM',
'Vim',
'VNLSL',
'VSL',
'W3C',
'WTFPL',
- 'wxWindows',
+ 'wxWidgets',
+ 'Xerox',
'xinetd',
'Zend',
'ZPLv1.0',
@@ -154,6 +159,7 @@ setOption("ValidLicenses", (
'ZPLv2.1',
'ZPLv2.1+',
'zlib',
+ 'zlib with acknowledgement',
# Documentation licenses
'CDL',
'FBSDDL',
@@ -164,12 +170,16 @@ setOption("ValidLicenses", (
# Content licenses
'CC-BY',
'CC-BY-SA',
+ 'CC-BY-ND',
'DSL',
+ 'EFML',
'Free Art',
# Font licenses
'Arphic',
'Baekmuk',
'Bitstream Vera',
+ 'Liberation',
+ 'Lucida',
'mplus',
'OFL',
'STIX',