rpms/rpmlint/devel rpmlint-0.93-rpm-4.8.patch, NONE, 1.1 rpmlint.spec, 1.71, 1.72

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/rpmlint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14070

Modified Files:
	rpmlint.spec 
Added Files:
	rpmlint-0.93-rpm-4.8.patch 
Log Message:
* Tue Jan 26 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.93-2
- Apply upstream patch to fix spec file check with rpm >= 4.8.0.


rpmlint-0.93-rpm-4.8.patch:
 SpecCheck.py |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE rpmlint-0.93-rpm-4.8.patch ---
Index: SpecCheck.py
===================================================================
--- SpecCheck.py	(revision 1719)
+++ SpecCheck.py	(working copy)
@@ -526,7 +526,13 @@
                 # errors logged above already
                 pass
             if spec_obj:
-                for src in spec_obj.sources():
+                try:
+                    # rpm < 4.8.0
+                    sources = spec_obj.sources()
+                except TypeError:
+                    # rpm >= 4.8.0
+                    sources = spec_obj.sources
+                for src in sources:
                     (url, num, flags) = src
                     (scheme, netloc) = urlparse(url)[0:2]
                     if flags & 1: # rpmspec.h, rpm.org ticket #123


Index: rpmlint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- rpmlint.spec	25 Jan 2010 22:20:10 -0000	1.71
+++ rpmlint.spec	25 Jan 2010 23:11:37 -0000	1.72
@@ -1,6 +1,6 @@
 Name:           rpmlint
 Version:        0.93
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -10,6 +10,8 @@ Source0:        http://rpmlint.zarb.org/
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
 Source3:        %{name}-etc.config
+# Upstream post-0.93
+Patch0:         %{name}-0.93-rpm-4.8.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -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,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan 26 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.93-2
+- Apply upstream patch to fix spec file check with rpm >= 4.8.0.
+
 * Mon Jan 25 2010 Ville Skyttä <ville.skytta at iki.fi> - 0.93-1
 - Update to 0.93; fixes #531102 and #555284.
 - Enable checks requiring network access in default config.