rpms/rpmlint/EL-4 rpmlint.config,1.1,1.2 rpmlint.spec,1.16,1.17

Manuel Wolfshant (wolfy) fedora-extras-commits at redhat.com
Tue Mar 4 00:22:23 UTC 2008


Author: wolfy

Update of /cvs/pkgs/rpms/rpmlint/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28073

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
* Mon Mar  3 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.82-3
- Sync with rawhide:
-- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690).



Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpmlint.config	4 Mar 2007 08:18:46 -0000	1.1
+++ rpmlint.config	4 Mar 2008 00:21:43 -0000	1.2
@@ -19,10 +19,162 @@
     "/usr/bin/perl",
     "/usr/bin/python",
 ))
+
 setOption("DanglingSymlinkExceptions", (
     ['consolehelper$', 'usermode'],
     ['consolehelper-gtk$', 'usermode-gtk'],
 ))
+
+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.69 (Wiki revision 110) of that page.
+    'Adobe',
+    'AFL',
+    'AGPLv1',
+    'AGPLv3',
+    'AMPAS BSD',
+    'ARL',
+    '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 2.0',
+    'Artistic clarified',
+    'BitTorrent',
+    'Boost',
+    'BSD',
+    'BSD with advertising',
+    'CeCILL',
+    'CDDL',
+    'CPL',
+    'Condor',
+    'Copyright only',
+    'Cryptix',
+    'Crystal Stacker',
+    'EPL',
+    'eCos',
+    'EFL 2.0',
+    'EFL 2.0+',
+    'EU Datagrid',
+    'FTL',
+    'Giftware',
+    'Glide',
+    'gnuplot',
+    'GPL+',
+    'GPL+ or Artistic',
+    'GPLv2+ or Artistic',
+    'GPLv2',
+    'GPLv2 with exceptions',
+    'GPLv2+',
+    'GPLv2+ with exceptions',
+    'GPLv3',
+    'GPLv3 with exceptions',
+    'GPLv3+',
+    'GPLv3+ with exceptions',
+    'IBM',
+    'IJG',
+    'ImageMagick',
+    'iMatix',
+    'Imlib2',
+    'Intel ACPI',
+    'Interbase',
+    'ISC',
+    'Jabber',
+    'JasPer',
+    'LBNL BSD',
+    'LGPLv2',
+    'LGPLv2 with exceptions',
+    'LGPLv2+',
+    'LGPLv2+ with exceptions',
+    'LGPLv3',
+    'LGPLv3 with exceptions',
+    'LGPLv3+',
+    'LGPLv3+ with exceptions',
+    'libtiff',
+    'LPL',
+    'LPPL',
+    'mecab-ipadic',
+    'MIT',
+    'MPLv1.0',
+    'MPLv1.0+',
+    'MPLv1.1',
+    'MPLv1.1+',
+    'NCSA',
+    'NGPL',
+    'NOSL',
+    'Netscape',
+    'Nokia',
+    'OpenLDAP',
+    'OpenPBS',
+    'OReilly',
+    'OSL 1.0',
+    'OSL 1.0+',
+    'OSL 1.1',
+    'OSL 1.1+',
+    'OSL 2.0',
+    'OSL 2.0+',
+    'OSL 3.0',
+    'OSL 3.0+',
+    'OpenSSL',
+    'Phorum',
+    'PHP',
+    'Public Domain',
+    'Python',
+    'QPL',
+    'RPSL',
+    'Ruby',
+    'Sleepycat',
+    'SISSL',
+    'SLIB',
+    'SPL',
+    'TCL',
+    'UCD',
+    'Vim',
+    'VNLSL',
+    'VSL',
+    'W3C',
+    'WTFPL',
+    'wxWindows',
+    'xinetd',
+    'Zend',
+    'ZPLv1.0',
+    'ZPLv1.0+',
+    'ZPLv2.0',
+    'ZPLv2.0+',
+    'ZPLv2.1',
+    'ZPLv2.1+',
+    'zlib',
+    # Documentation licenses
+    'CDL',
+    'FBSDDL',
+    'GFDL',
+    'IEEE',
+    'OFSFDL',
+    'Open Publication',
+    # Content licenses
+    'CC-BY',
+    'CC-BY-SA',
+    'DSL',
+    'Free Art',
+    # Font licenses
+    'Arphic',
+    'Baekmuk',
+    'Bitstream Vera',
+    'mplus',
+    'OFL',
+    'STIX',
+    'Utopia',
+    'XANO',
+    # 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",
@@ -52,7 +204,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/EL-4/rpmlint.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- rpmlint.spec	14 Jan 2008 16:20:45 -0000	1.16
+++ rpmlint.spec	4 Mar 2008 00:21:43 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.82
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -70,7 +70,11 @@
 
 
 %changelog
-* Sun Jan  13 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.82-1
+* Mon Mar  3 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.82-3
+- Sync with rawhide:
+-- Sync Fedora license list with Revision 0.69 (Wiki rev 110) (#434690).
+
+* Sun Jan 13 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.82-1
 - Sync with current rawhide:
 -- 0.82, fixes #362441, #388881, #399871, #409941.
 -- Sync Fedora license list with Revision 0.61 (Wiki rev 98).




More information about the fedora-extras-commits mailing list