rpms/rpmlint/FC-6 rpmlint-0.80-fedoralicensing.patch, NONE, 1.1 rpmlint.config, 1.6, 1.7 rpmlint.spec, 1.29, 1.30
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Aug 2 19:21:28 UTC 2007
- Previous message (by thread): rpms/MyPasswordSafe/F-7 MyPasswordSafe-20061216-use-system-uuid.patch, NONE, 1.1 MyPasswordSafe.desktop, NONE, 1.1 MyPasswordSafe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/rpmlint/F-7 rpmlint.spec,1.31,1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/rpmlint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11784/FC-6
Modified Files:
rpmlint.config rpmlint.spec
Added Files:
rpmlint-0.80-fedoralicensing.patch
Log Message:
Sync with devel
rpmlint-0.80-fedoralicensing.patch:
--- NEW FILE rpmlint-0.80-fedoralicensing.patch ---
--- TagsCheck.py~ 2007-03-26 23:01:49.000000000 +0300
+++ TagsCheck.py 2007-07-31 23:23:08.000000000 +0300
@@ -629,11 +629,11 @@
printError(pkg, 'no-license')
else:
if rpm_license not in VALID_LICENSES:
- licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license)
+ licenses = re.split('\s(?:and|or)\s|[()]', rpm_license)
for l in licenses:
+ l = l.strip()
if l != '' and not l in VALID_LICENSES:
- printWarning(pkg, 'invalid-license', rpm_license)
- break
+ printWarning(pkg, 'invalid-license', l)
url=pkg[rpm.RPMTAG_URL]
if url and url != 'none':
@@ -800,9 +800,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: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/FC-6/rpmlint.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmlint.config 12 Apr 2007 21:14:27 -0000 1.6
+++ rpmlint.config 2 Aug 2007 19:20:52 -0000 1.7
@@ -4,7 +4,6 @@
# options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed.
from Config import *
-from TagsCheck import DEFAULT_VALID_LICENSES
setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)')
setOption("UseVersionInChangeLog", 1)
@@ -20,13 +19,114 @@
"/usr/bin/perl",
"/usr/bin/python",
))
+
setOption("DanglingSymlinkExceptions", (
['consolehelper$', 'usermode'],
['consolehelper-gtk$', 'usermode-gtk'],
))
-setOption("ValidLicenses",
- DEFAULT_VALID_LICENSES +
- ("Redistributable, no modification permitted", ))
+
+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
+ 'AFL',
+ 'Affero GPL',
+ 'ASL 1.0',
+ 'ASL 1.0+',
+ 'ASL 1.1',
+ 'ASL 1.1+',
+ 'ASL 2.0',
+ 'ASL 2.0+',
+ 'APSL 2.0',
+ 'APSL 2.0+',
+ 'Artistic clarified',
+ 'Boost',
+ 'BSD with advertising',
+ 'BSD',
+ 'CeCILL',
+ 'CDDL',
+ 'CPL',
+ 'Condor',
+ 'Cryptix',
+ 'EPL',
+ 'eCos',
+ 'EFL 2.0',
+ 'EFL 2.0+',
+ 'EU Datagrid',
+ 'GPL+',
+ 'GPLv2',
+ 'GPLv2+',
+ 'GPLv3',
+ 'GPLv3+',
+ 'IBM',
+ 'iMatix',
+ 'Intel ACPI',
+ 'Interbase',
+ 'Jabber',
+ 'LaTeX',
+ 'LGPL+',
+ 'LGPLv2',
+ 'LGPLv2 with exceptions',
+ 'LGPLv2+',
+ 'LGPLv3',
+ 'LGPLv3+',
+ 'LPL',
+ 'mecab-ipadic',
+ 'MIT',
+ 'MPLv1.0',
+ 'MPLv1.0+',
+ 'MPLv1.1',
+ 'MPLv1.1+',
+ 'NCSA',
+ 'NGPL',
+ 'NOSL',
+ 'Netscape',
+ 'Nokia',
+ 'OpenLDAP',
+ 'OSL 1.0',
+ 'OSL 1.0+',
+ 'OpenSSL',
+ 'Phorum',
+ 'PHP',
+ 'Public Domain',
+ 'Python',
+ 'QPL',
+ 'RPSL',
+ 'Ruby',
+ 'Sleepycat',
+ 'SMLNJL',
+ 'SISSL',
+ 'SPL',
+ 'Vim',
+ 'VNLSL',
+ 'VSL',
+ 'W3C',
+ 'WTFPL',
+ 'wxWindows',
+ 'xinetd',
+ 'Zend',
+ 'ZPLv1.0',
+ 'ZPLv1.0+',
+ 'ZPLv2.0',
+ 'ZPLv2.0+',
+ 'zlib',
+ # Documentation licenses
+ 'CDL',
+ 'FBSDDL',
+ 'GFDL',
+ 'Open Publication',
+ # Content licenses
+ 'CC-BY',
+ 'CC-BY-SA',
+ 'DSL',
+ 'Free Art',
+ # Font licenses
+ 'Arphic',
+ 'SIL Open Font',
+ # Others
+ 'Redistributable, no modification permitted',
+ 'Freely redistributable without restriction',
+))
+
# Standard users & groups from the setup package:
setOption("StandardUsers",
("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt",
@@ -61,3 +161,4 @@
addFilter("non-standard-dir-in-usr libexec")
addFilter(" gpg-pubkey ")
addFilter(" doc-file-dependency .* /bin/sh$")
+addFilter("hardcoded-library-path .*/lib/udev(/|$)")
Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/FC-6/rpmlint.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rpmlint.spec 12 Apr 2007 21:14:27 -0000 1.29
+++ rpmlint.spec 2 Aug 2007 19:20:52 -0000 1.30
@@ -1,15 +1,16 @@
Name: rpmlint
Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Tool for checking common errors in RPM packages
Group: Development/Tools
-License: GPL
+License: GPLv2
URL: http://rpmlint.zarb.org/
Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
Source1: %{name}.config
Patch0: %{name}-0.78-distregex.patch
Patch1: %{name}-0.77-compile.patch
+Patch2: %{name}-0.80-fedoralicensing.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -32,6 +33,7 @@
%setup -q
%patch0
%patch1
+%patch2
sed -i -e /MenuCheck/d Config.py
@@ -66,6 +68,12 @@
%changelog
+* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa at redhat.com> - 0.80-2
+- new fedora licensing scheme
+
+* Thu May 31 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Filter hardcoded-library-path errors for /lib/udev.
+
* Thu Apr 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.80-1
- 0.80, fixes #227389, #228645, #233795.
- Accept "Redistributable, no modification permitted" as a valid license.
- Previous message (by thread): rpms/MyPasswordSafe/F-7 MyPasswordSafe-20061216-use-system-uuid.patch, NONE, 1.1 MyPasswordSafe.desktop, NONE, 1.1 MyPasswordSafe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/rpmlint/F-7 rpmlint.spec,1.31,1.32
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list