rpms/rpmlint/EL-5 rpmlint.config,1.7,1.8 rpmlint.spec,1.32,1.33

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


Author: wolfy

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

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-5/rpmlint.config,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmlint.config	6 Oct 2007 18:30:35 -0000	1.7
+++ rpmlint.config	4 Mar 2008 00:02:34 -0000	1.8
@@ -28,10 +28,12 @@
 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.55 (Wiki revision 92) of that page.
+    # Last synced with Revision 0.69 (Wiki revision 110) of that page.
     'Adobe',
-    'Affero GPL',
     'AFL',
+    'AGPLv1',
+    'AGPLv3',
+    'AMPAS BSD',
     'ARL',
     'ASL 1.0',
     'ASL 1.0+',
@@ -84,11 +86,15 @@
     'ISC',
     'Jabber',
     'JasPer',
+    'LBNL BSD',
     'LGPLv2',
     'LGPLv2 with exceptions',
     'LGPLv2+',
+    'LGPLv2+ with exceptions',
     'LGPLv3',
+    'LGPLv3 with exceptions',
     'LGPLv3+',
+    'LGPLv3+ with exceptions',
     'libtiff',
     'LPL',
     'LPPL',
@@ -161,6 +167,7 @@
     'Bitstream Vera',
     'mplus',
     'OFL',
+    'STIX',
     'Utopia',
     'XANO',
     # Others


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-5/rpmlint.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- rpmlint.spec	14 Jan 2008 11:15:45 -0000	1.32
+++ rpmlint.spec	4 Mar 2008 00:02:34 -0000	1.33
@@ -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