summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2013-08-13 10:47:31 -0400
committerAnas Nashif <anas.nashif@intel.com>2013-08-13 10:47:31 -0400
commitd4b38deeccf48b4ae363ef2e0397952391153058 (patch)
tree50218245ae40f49e7a7f4c7dfd0c29374a3472aa
parent00cd9b97e933a8d3c7b53ea90e178b35cfaf10b7 (diff)
downloadrpmlint-d4b38deeccf48b4ae363ef2e0397952391153058.tar.gz
rpmlint-d4b38deeccf48b4ae363ef2e0397952391153058.tar.bz2
rpmlint-d4b38deeccf48b4ae363ef2e0397952391153058.zip
Update licenses and add TIZEN-* licensessubmit/tizen/20130813.144733
-rw-r--r--TagsCheck.py4
-rw-r--r--packaging/licenses.config7
-rw-r--r--packaging/rpmlint.changes3
3 files changed, 10 insertions, 4 deletions
diff --git a/TagsCheck.py b/TagsCheck.py
index 066ee19..48486d4 100644
--- a/TagsCheck.py
+++ b/TagsCheck.py
@@ -804,8 +804,8 @@ class TagsCheck(AbstractCheck.AbstractCheck):
printError(pkg, 'no-license')
else:
valid_license = True
- for p in ['TBD', 'TO BE', 'FILLED', 'Unspecified', 'TO_BE', 'TIZEN', 'samsung', 'Samsung' ]:
- if p in rpm_license:
+ for p in ['TBD', 'TO BE', 'FILLED', 'Unspecified', 'TO_BE', 'samsung', 'Samsung' ]:
+ if p in rpm_license or p.lower() in rpm_license:
printWarning(pkg, 'license-placeholder-not-allowed', rpm_license)
valid_license = False
break
diff --git a/packaging/licenses.config b/packaging/licenses.config
index b6c2b95..931233e 100644
--- a/packaging/licenses.config
+++ b/packaging/licenses.config
@@ -219,7 +219,10 @@ setOption('ValidLicenses', (
'ZPL-1.1',
'ZPL-2.0',
'ZPL-2.1',
-'Flora',
-'LGPL-2.1+-with-GCC-exception',
+'TIZEN-Flora',
+'TIZEN-LGPL-2.1+-with-GCC-exception',
+'TIZEN-Vim',
+'TIZEN-Tcl',
'Vim',
+'Flora',
))
diff --git a/packaging/rpmlint.changes b/packaging/rpmlint.changes
index 5424a7f..0cdf0da 100644
--- a/packaging/rpmlint.changes
+++ b/packaging/rpmlint.changes
@@ -1,3 +1,6 @@
+* Tue Aug 13 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130802.145509@00cd9b9
+- Update licenses and add TIZEN-* licenses
+
* Thu Aug 01 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130712.022129@0bdfcdd
- Add glibc license
- re-add Development/Libraries to avoid mass failure of packages for now