summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2008-12-08 00:25:32 -0500
committerTodd Zullinger <tmz@pobox.com>2008-12-08 00:25:32 -0500
commitabfa2892b3bec7d01334b3014dd1894bf83f7d9e (patch)
tree05e21064471430d106ae776e45745c3e0b10c028
parent1f107bbbe9d7a227d8213ad14649611814510de4 (diff)
downloadlicense-check-abfa2892b3bec7d01334b3014dd1894bf83f7d9e.tar.gz
license-check-abfa2892b3bec7d01334b3014dd1894bf83f7d9e.tar.xz
license-check-abfa2892b3bec7d01334b3014dd1894bf83f7d9e.zip
Sync license list with rev 1.31, 01 Dec 2008
-rw-r--r--rpmlint.config38
1 files changed, 33 insertions, 5 deletions
diff --git a/rpmlint.config b/rpmlint.config
index 73c77ad..2a1103b 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -5,7 +5,7 @@
from Config import *
-setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)')
+setOption("ReleaseExtension", '\.(fc|rhe?l|el)\d+(?=\.|$)')
setOption("UseVersionInChangeLog", 1)
setOption("UseBzip2", 0)
setOption("UseDefaultRunlevels", 0)
@@ -28,7 +28,8 @@ 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.96 of that page.
+ # Last synced with revision "1.31, 01 Dec 2008" of that page.
+ 'AAL',
'Adobe',
'ADSL',
'AFL',
@@ -50,31 +51,39 @@ setOption("ValidLicenses", (
'Boost',
'BSD',
'BSD with advertising',
+ 'CATOSL',
'CeCILL',
+ 'CeCILL-B',
+ 'CeCILL-C',
'CDDL',
+ 'CNRI',
'CPAL',
'CPL',
'Condor',
'Copyright only',
'Crystal Stacker',
'DOC',
- 'EPL',
- 'eCos',
+ 'dvipdfm',
'ECL 1.0',
'ECL 2.0',
+ 'eCos',
'EFL 2.0',
'EFL 2.0+',
+ 'Entessa',
+ 'EPL',
'ERPL',
'EU Datagrid',
+ 'Eurosym',
'Fair',
'FTL',
'Giftware',
- 'Glide',
'GL2PS',
+ 'Glide',
'gnuplot',
'GPL+',
'GPL+ or Artistic',
'GPLv1',
+ 'GPLv2 or Artistic',
'GPLv2+ or Artistic',
'GPLv2',
'GPLv2 with exceptions',
@@ -98,6 +107,7 @@ setOption("ValidLicenses", (
'LGPLv2',
'LGPLv2 with exceptions',
'LGPLv2+',
+ 'LGPLv2+ or Artistic',
'LGPLv2+ with exceptions',
'LGPLv3',
'LGPLv3 with exceptions',
@@ -122,6 +132,7 @@ setOption("ValidLicenses", (
'Naumen',
'Netscape',
'Nokia',
+ 'Noweb',
'OpenLDAP',
'OpenPBS',
'OReilly',
@@ -131,11 +142,16 @@ setOption("ValidLicenses", (
'OSL 1.1+',
'OSL 2.0',
'OSL 2.0+',
+ 'OSL 2.1',
+ 'OSL 2.1+',
'OSL 3.0',
'OSL 3.0+',
'OpenSSL',
+ 'OReilly',
'Phorum',
'PHP',
+ 'PlainTeX',
+ 'psutils',
'Public Domain',
'Python',
'Qhull',
@@ -150,6 +166,9 @@ setOption("ValidLicenses", (
'SLIB',
'SPL',
'TCL',
+ 'Teeworlds',
+ 'TMate',
+ 'TPL',
'UCD',
'VOSTROM',
'Vim',
@@ -157,9 +176,11 @@ setOption("ValidLicenses", (
'VSL',
'W3C',
'WTFPL',
+ 'Webmin',
'wxWidgets',
'Xerox',
'xinetd',
+ 'YPLv1.1',
'Zend',
'ZPLv1.0',
'ZPLv1.0+',
@@ -181,13 +202,18 @@ setOption("ValidLicenses", (
'CC-BY',
'CC-BY-SA',
'CC-BY-ND',
+ 'DMTF',
'DSL',
'EFML',
'Free Art',
+ 'GeoGratis',
+ 'Green OpenMusic',
+ 'OAL',
# Font licenses
'Arphic',
'Baekmuk',
'Bitstream Vera',
+ 'Hershey',
'Liberation',
'Lucida',
'mplus',
@@ -235,3 +261,5 @@ addFilter("non-standard-dir-in-usr libexec")
addFilter("^gpg-pubkey:")
addFilter(" doc-file-dependency .* /bin/sh$")
addFilter("hardcoded-library-path .*/lib/udev(/|$)")
+addFilter("not-standard-release-extension")
+addFilter("explicit-lib-dependency (liberation-fonts|libertas-.*-firmware)")