rpms/rpmlint/F-12 rpmlint-0.95-srcfilename.patch, NONE, 1.1 .cvsignore, 1.28, 1.29 rpmlint.config, 1.39, 1.40 rpmlint.spec, 1.71, 1.72 sources, 1.28, 1.29

Ville Skyttä scop at fedoraproject.org
Sat Mar 6 18:17:10 UTC 2010 

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31422/F-12

Modified Files:
	.cvsignore rpmlint.config rpmlint.spec sources 
Added Files:
	rpmlint-0.95-srcfilename.patch 
Log Message:
* Sat Mar  6 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.95-2
- Patch to fix non-coherent-filename regression for source packages.

* Wed Mar  3 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.95-1
- Update to 0.95; fixes #564585, #567285, #568498, and #570086.


rpmlint-0.95-srcfilename.patch:
 TagsCheck.py |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE rpmlint-0.95-srcfilename.patch ---
Index: TagsCheck.py
===================================================================
--- TagsCheck.py	(revision 1737)
+++ TagsCheck.py	(revision 1738)
@@ -803,8 +803,12 @@
                     j += 1
                 i += 1
 
-        expected = pkg.header.sprintf(
-            rpm.expandMacro("%{_build_name_fmt}")).split("/")[-1]
+        expfmt = rpm.expandMacro("%{_build_name_fmt}")
+        if pkg.isSource():
+            # _build_name_fmt often (always?) ends up not outputting src/nosrc
+            # as arch for source packages, do it ourselves
+            expfmt = re.sub(r'(?i)%\{?ARCH\b\}?', pkg.arch, expfmt)
+        expected = pkg.header.sprintf(expfmt).split("/")[-1]
         basename = os.path.basename(pkg.filename)
         if basename != expected:
             printWarning(pkg, 'non-coherent-filename', basename, expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- .cvsignore	31 Jan 2010 23:14:16 -0000	1.28
+++ .cvsignore	6 Mar 2010 18:17:09 -0000	1.29
@@ -1 +1 @@
-rpmlint-0.94.tar.bz2
+rpmlint-0.95.tar.bz2


Index: rpmlint.config
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/rpmlint.config,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- rpmlint.config	31 Jan 2010 23:14:17 -0000	1.39
+++ rpmlint.config	6 Mar 2010 18:17:10 -0000	1.40
@@ -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


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/rpmlint.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- rpmlint.spec	31 Jan 2010 23:14:17 -0000	1.71
+++ rpmlint.spec	6 Mar 2010 18:17:10 -0000	1.72
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.94
-Release:        1%{?dist}
+Version:        0.95
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,13 +10,15 @@ Source0:        http://rpmlint.zarb.org/
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
 Source3:        %{name}-etc.config
+# http://rpmlint.zarb.org/cgi-bin/trac.cgi/changeset/1738/trunk/TagsCheck.py
+Patch0:         %{name}-0.95-srcfilename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 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
@@ -39,6 +41,7 @@ and source packages as well as spec file
 
 %prep
 %setup -q
+%patch0
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -78,6 +81,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar  6 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.95-2
+- Patch to fix non-coherent-filename regression for source packages.
+
+* Wed Mar  3 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.95-1
+- Update to 0.95; fixes #564585, #567285, #568498, and #570086.
+
 * Mon Feb  1 2010 Ville Skyttä <ville.skytta at 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).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/F-12/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- sources	31 Jan 2010 23:14:17 -0000	1.28
+++ sources	6 Mar 2010 18:17:10 -0000	1.29
@@ -1 +1 @@
-4e3d9a668732761420fc3d865fce835c  rpmlint-0.94.tar.bz2
+08b9ab40ceecc94e6832b78d0582885d  rpmlint-0.95.tar.bz2

More information about the scm-commits mailing list