rpms/rpmlint/EL-4 rpmlint.config,1.3,1.4 rpmlint.spec,1.18,1.19

[Manuel Wolfshant (wolfy)]

Author: wolfy

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

Modified Files:
	rpmlint.config rpmlint.spec 
Log Message:
resync with rawhide



Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmlint.config	27 May 2008 22:06:19 -0000	1.3
+++ rpmlint.config	3 Jun 2008 21:00:31 -0000	1.4
@@ -28,7 +28,7 @@
 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.83 (Wiki revision 131) of that page.
+    # Last synced with Revision 0.88 of that page.
     'Adobe',
     'ADSL',
     'AFL',
@@ -71,6 +71,7 @@
     'gnuplot',
     'GPL+',
     'GPL+ or Artistic',
+    'GPLv1',
     'GPLv2+ or Artistic',
     'GPLv2',
     'GPLv2 with exceptions',
@@ -132,7 +133,9 @@
     'PHP',
     'Public Domain',
     'Python',
+    'Qhull',
     'QPL',
+    'RiceBSD',
     'RPSL',
     'Ruby',
     'Sendmail',
@@ -167,6 +170,7 @@
     'IEEE',
     'OFSFDL',
     'Open Publication',
+    'Public Use',
     # Content licenses
     'CC-BY',
     'CC-BY-SA',


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/EL-4/rpmlint.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rpmlint.spec	27 May 2008 22:06:19 -0000	1.18
+++ rpmlint.spec	3 Jun 2008 21:00:31 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.83
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -68,6 +68,9 @@
 
 
 %changelog
+* Tue May 27 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.83-1
+- resync, bump release to match
+
 * Tue May 27 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.83-0.1
 - Sync with rawhide:
 --Tue May 27 2008  Ville Skyttä