From 1468d1ba3f5e09cddf97d6eed4c1ee1e3ebaa6da Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Mar 03 2010 20:43:08 +0000
Subject: - Update to 0.95; fixes #564585, #567285, #568498, and #570086.


---

diff --git a/.cvsignore b/.cvsignore
index d230d0f..ef485cd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpmlint-0.94.tar.bz2
+rpmlint-0.95.tar.bz2
diff --git a/rpmlint.config b/rpmlint.config
index 3e99b13..40ae8d4 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -40,13 +40,14 @@ setOption("DanglingSymlinkExceptions", (
 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 "1.65, 26 Jan 2010" of that page.
+    # Last synced with revision "1.68, 18 Feb 2010" of that page.
     'AAL',
     'Adobe',
     'ADSL',
     'AFL',
     'AGPLv1',
     'AGPLv3',
+    'AGPLv3 with exceptions',
     'AMDPLPA',
     'AMPAS BSD',
     'ARL',
@@ -177,6 +178,7 @@ setOption("ValidLicenses", (
     'PHP',
     'PlainTeX',
     'Plexus',
+    'PostgreSQL',
     'psutils',
     'Public Domain',
     'Python',
@@ -242,16 +244,22 @@ setOption("ValidLicenses", (
     'Green OpenMusic',
     'OAL',
     # Font licenses
+    'AMS',
     'Arphic',
     'Baekmuk',
     'Bitstream Vera',
+    'DoubleStroke',
     'Hershey',
+    'IPA',
     'Liberation',
     'Lucida',
+    'MgOpen',
     'mplus',
     'OFL',
+    'PTFL',
     'STIX',
     'Utopia',
+    'Wadalab',
     'XANO',
     # Others
     'Redistributable, no modification permitted',
@@ -269,7 +277,9 @@ try:
 except:
     pass
 if setup_pkg:
-    uidgid_regex = re.compile('^\s*(\S+)\s+(-|\d+)\s+(-|\d+)\s')
+    users = set()
+    groups = set()
+    uidgid_regex = re.compile(r'^\s*(\S+)\s+(-|\d+)\s+(-|\d+|\(\d+\))\s')
     for uidgid_file in [x for x in setup_pkg.files() if x.endswith('/uidgid')]:
         if os.path.exists(uidgid_file):
             fobj = open(uidgid_file)
@@ -279,15 +289,17 @@ if setup_pkg:
                     if res:
                         name = res.group(1)
                         if res.group(2) != '-':
-                            getOption('StandardUsers').append(name)
-                        if res.group(3) != '-':
-                            getOption('StandardGroups').append(name)
+                            users.add(name)
+                        if res.group(3) != '-' and not '(' in res.group(3):
+                            groups.add(name)
                     del res
                 del line
             finally:
                 fobj.close()
             del fobj
-    del uidgid_regex, uidgid_file
+    setOption('StandardUsers', sorted(users))
+    setOption('StandardGroups', sorted(groups))
+    del uidgid_regex, uidgid_file, users, groups
 del setup_pkg
 
 # Output filters
diff --git a/rpmlint.spec b/rpmlint.spec
index 38c2128..c923dd4 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.94
+Version:        0.95
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
@@ -16,7 +16,7 @@ BuildArch:      noarch
 BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python >= 4.4
 BuildRequires:  sed >= 3.95
-Requires:       rpm-python >= 4.4
+Requires:       rpm-python >= 4.4.2.2
 Requires:       python >= 2.4
 %if ! 0%{?rhel}
 # python-magic and python-enchant are actually optional dependencies, but
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar  3 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.95-1
+- Update to 0.95; fixes #564585, #567285, #568498, and #570086.
+
 * Mon Feb  1 2010 Ville Skyttä <ville.skytta@iki.fi> - 0.94-1
 - Update to 0.94; rpm >= 4.8.0 spec file check fix included upstream.
 - Sync Fedora license list with Wiki revision 1.65 (#559156).
diff --git a/sources b/sources
index 1665320..a4cff03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4e3d9a668732761420fc3d865fce835c  rpmlint-0.94.tar.bz2
+08b9ab40ceecc94e6832b78d0582885d  rpmlint-0.95.tar.bz2