rpms/rpmlint/F-7 rpmlint-0.81-fedoralicensing.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 rpmlint.config, 1.10, 1.11 rpmlint.spec, 1.33, 1.34 sources, 1.16, 1.17 rpmlint-0.80-fedoralicensing.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed Sep 5 20:04:57 UTC 2007
- Previous message (by thread): rpms/nss/devel nss-create-obj.patch, NONE, 1.1 nss-enable-pem.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 nss.spec, 1.26, 1.27 sources, 1.10, 1.11
- Next message (by thread): rpms/rogue/devel .cvsignore, 1.2, 1.3 rogue.spec, 1.11, 1.12 sources, 1.2, 1.3 rogue-5.4-setgid.patch, 1.3, NONE rogue-5.4.2-64bit.patch, 1.1, NONE rogue-5.4.2-warnings.patch, 1.1, NONE rogue-includes.patch, 1.1, NONE rogue-rpmopts.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/rpmlint/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872
Modified Files:
.cvsignore rpmlint.config rpmlint.spec sources
Added Files:
rpmlint-0.81-fedoralicensing.patch
Removed Files:
rpmlint-0.80-fedoralicensing.patch
Log Message:
Sync with devel
rpmlint-0.81-fedoralicensing.patch:
--- NEW FILE rpmlint-0.81-fedoralicensing.patch ---
--- TagsCheck.py~ 2007-08-29 23:46:39.000000000 +0300
+++ TagsCheck.py 2007-09-03 19:54:09.000000000 +0300
@@ -403,6 +403,7 @@
invalid_url_regex=re.compile(Config.getOption('InvalidURL'), re.IGNORECASE)
lib_regex=re.compile('^lib.*?(\.so.*)?$')
leading_space_regex=re.compile('^\s+')
+license_regex=re.compile('\(([^)]+)\)|\s(?:and|or)\s')
invalid_version_regex=re.compile('([0-9](?:rc|alpha|beta|pre).*)', re.IGNORECASE)
# () are here for grouping purpose in the regexp
forbidden_words_regex=re.compile('(' + Config.getOption('ForbiddenWords') + ')', re.IGNORECASE)
@@ -628,16 +629,20 @@
# printWarning(pkg, 'package-provides-itself')
# break
+ def split_license(license):
+ return map(string.strip, [l for l in license_regex.split(license) if l])
+
rpm_license = pkg[rpm.RPMTAG_LICENSE]
if not rpm_license:
printError(pkg, 'no-license')
else:
if rpm_license not in VALID_LICENSES:
- licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
- for l in licenses:
- if l != '' and not l in VALID_LICENSES:
- printWarning(pkg, 'invalid-license', rpm_license)
- break
+ for l1 in split_license(rpm_license):
+ if l1 in VALID_LICENSES:
+ continue
+ for l2 in split_license(l1):
+ if l2 not in VALID_LICENSES:
+ printWarning(pkg, 'invalid-license', l2)
url=pkg[rpm.RPMTAG_URL]
if url and url != 'none':
@@ -808,9 +813,7 @@
'invalid-license',
'''The value of the License tag was not recognized. Known values are:
-%s
-If the license is close to an existing one, you can use '<license> style'.''' \
-% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
+%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78),
'invalid-url',
'''Your URL is not valid. It must begin with http, https or ftp and must no
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 12 Apr 2007 20:45:44 -0000 1.16
+++ .cvsignore 5 Sep 2007 20:04:24 -0000 1.17
@@ -1 +1 @@
-rpmlint-0.80.tar.bz2
+rpmlint-0.81.tar.bz2
Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/rpmlint.config,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rpmlint.config 16 Aug 2007 15:41:16 -0000 1.10
+++ rpmlint.config 5 Sep 2007 20:04:24 -0000 1.11
@@ -28,9 +28,11 @@
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 Wiki revision 68 of that page.
+ # Last synced with Wiki revision 87 of that page.
+ 'Adobe',
'Affero GPL',
'AFL',
+ 'ARL',
'ASL 1.0',
'ASL 1.0+',
'ASL 1.1',
@@ -59,6 +61,7 @@
'EU Datagrid',
'Giftware',
'Glide',
+ 'gnuplot',
'GPL+',
'GPL+ or Artistic',
'GPLv2',
@@ -68,6 +71,7 @@
'GPLv3+',
'IBM',
'IJG',
+ 'ImageMagick',
'iMatix',
'Intel ACPI',
'Interbase',
@@ -94,8 +98,11 @@
'Netscape',
'Nokia',
'OpenLDAP',
+ 'OpenPBS',
'OSL 1.0',
'OSL 1.0+',
+ 'OSL 1.1',
+ 'OSL 1.1+',
'OSL 2.0',
'OSL 2.0+',
'OSL 3.0',
@@ -110,6 +117,7 @@
'Ruby',
'Sleepycat',
'SISSL',
+ 'SLIB',
'SPL',
'TCL',
'UCD',
@@ -125,11 +133,15 @@
'ZPLv1.0+',
'ZPLv2.0',
'ZPLv2.0+',
+ 'ZPLv2.1',
+ 'ZPLv2.1+',
'zlib',
# Documentation licenses
'CDL',
'FBSDDL',
'GFDL',
+ 'IEEE',
+ 'OFSFDL',
'Open Publication',
# Content licenses
'CC-BY',
@@ -142,6 +154,7 @@
'mplus',
'OFL',
'Utopia',
+ 'XANO',
# Others
'Redistributable, no modification permitted',
'Freely redistributable without restriction',
@@ -176,9 +189,9 @@
addFilter("jar-not-indexed")
addFilter("invalid-(lc-messages|locale-man)-dir")
addFilter("outside-libdir-files")
-addFilter("-debuginfo no-documentation")
-addFilter("-debuginfo [^ ]+ /usr/lib/debug/")
+addFilter("-debuginfo.* no-documentation")
+addFilter("-debuginfo.* /usr/lib/debug/")
addFilter("non-standard-dir-in-usr libexec")
-addFilter(" gpg-pubkey ")
+addFilter("^gpg-pubkey:")
addFilter(" doc-file-dependency .* /bin/sh$")
addFilter("hardcoded-library-path .*/lib/udev(/|$)")
Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/rpmlint.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- rpmlint.spec 16 Aug 2007 15:41:16 -0000 1.33
+++ rpmlint.spec 5 Sep 2007 20:04:24 -0000 1.34
@@ -1,6 +1,6 @@
Name: rpmlint
-Version: 0.80
-Release: 3%{?dist}
+Version: 0.81
+Release: 1%{?dist}
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
@@ -11,7 +11,7 @@
Source2: %{name}-CHANGES.package.old
Patch0: %{name}-0.78-distregex.patch
Patch1: %{name}-0.77-compile.patch
-Patch2: %{name}-0.80-fedoralicensing.patch
+Patch2: %{name}-0.81-fedoralicensing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -70,6 +70,14 @@
%changelog
+* Mon Sep 3 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.81-1
+- 0.81, fixes #239611, #240840, #241471, #244835.
+- Improve Fedora license check (Todd Zullinger).
+- Sync Fedora license list with Wiki rev 87.
+
+* Wed Aug 29 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Sync Fedora license list with Wiki rev 84 (Todd Zullinger).
+
* Thu Aug 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.80-3
- Sync Fedora license list with Wiki rev 68.
- Move pre-2006 changelog entries to CHANGES.package.old.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-7/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 12 Apr 2007 20:45:44 -0000 1.16
+++ sources 5 Sep 2007 20:04:24 -0000 1.17
@@ -1 +1 @@
-31e1bda0b4e19188a7a5b075dc1a203f rpmlint-0.80.tar.bz2
+1f4b9bde98f270d196bb9f0364d376e8 rpmlint-0.81.tar.bz2
--- rpmlint-0.80-fedoralicensing.patch DELETED ---
- Previous message (by thread): rpms/nss/devel nss-create-obj.patch, NONE, 1.1 nss-enable-pem.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 nss.spec, 1.26, 1.27 sources, 1.10, 1.11
- Next message (by thread): rpms/rogue/devel .cvsignore, 1.2, 1.3 rogue.spec, 1.11, 1.12 sources, 1.2, 1.3 rogue-5.4-setgid.patch, 1.3, NONE rogue-5.4.2-64bit.patch, 1.1, NONE rogue-5.4.2-warnings.patch, 1.1, NONE rogue-includes.patch, 1.1, NONE rogue-rpmopts.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list