From 6a047fdab5327d8bd65bf4ae86afad0cd6df8f1d Mon Sep 17 00:00:00 2001
From: "Tom \"spot\" Callaway" <tcallawa@redhat.com>
Date: Sun, 24 Apr 2011 21:58:38 -0400
Subject: [PATCH] update to 1.2, filter out files-attr-not-set except for el4

---
 .gitignore         |  1 +
 rpmlint.config     |  3 +++
 rpmlint.config.el4 |  4 ++++
 rpmlint.spec       | 15 ++++++---------
 sources            |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7fff29a..1575f27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /rpmlint-1.0.tar.bz2
 /rpmlint-1.1.tar.xz
+/rpmlint-1.2.tar.xz
diff --git a/rpmlint.config b/rpmlint.config
index 195c183..7695688 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -353,6 +353,9 @@ addFilter("blender.+ (wrong-script-interpreter|non-executable-script) .+/blender
 addFilter("no-cleaning-of-buildroot")
 addFilter("no-buildroot-tag")
 addFilter("no-%clean-section")
+# Only EL4 needs the files-attr-not-set check, because rpm 4.4 and newer no longer need a %defattr line
+# (it automatically provides one).
+addFilter("files-attr-not-set")
 # https://bugzilla.redhat.com/496737, https://bugzilla.redhat.com/646455
 for pkg, exe in (("coreutils", "/bin/su"),
                  ("krb5-workstation", "/usr/kerberos/bin/ksu"),
diff --git a/rpmlint.config.el4 b/rpmlint.config.el4
index 356368d..f562611 100644
--- a/rpmlint.config.el4
+++ b/rpmlint.config.el4
@@ -20,3 +20,7 @@ removeFilter("no-cleaning-of-buildroot")
 removeFilter("no-buildroot-tag")
 removeFilter("no-%clean-section")
 
+# Only EL4 needs the files-attr-not-set check, because rpm 4.4 and newer no longer need a %defattr line
+# (it automatically provides one).
+removeFilter("files-attr-not-set")
+
diff --git a/rpmlint.spec b/rpmlint.spec
index de50879..667e1b8 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        1.1
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -15,12 +15,6 @@ Source4:        %{name}.config.el4
 # EL-5 specific config
 Source5:        %{name}.config.el5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# Don't try to check Content-Length and Content-MD5 for invalid Source URLs
-# http://rpmlint.zarb.org/cgi-bin/trac.cgi/changeset/1836
-# https://bugzilla.redhat.com/show_bug.cgi?id=680781
-Patch0:		rpmlint-1.1-changeset1836.patch
-
 BuildArch:      noarch
 BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python >= 4.4
@@ -48,7 +42,6 @@ and source packages as well as spec files can be checked.
 
 %prep
 %setup -q
-%patch0 -p1 -b .1836
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -95,6 +88,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 24 2011 Tom Callaway <spot@fedoraproject.org> - 1.2-1
+- update to 1.2
+- filter away files-attr-not-set for all targets except EL-4 (bz694579)
+
 * Thu Mar  3 2011 Tom Callaway <spot@fedoraproject.org> - 1.1-3
 - apply upstream fix for source url aborts (bz 680781)
 
diff --git a/sources b/sources
index 0b82f6c..3ec254f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29a35c13cc2f16325b404820e2986a88  rpmlint-1.1.tar.xz
+adc01e86aa1ebb8a93d162bbac238444  rpmlint-1.2.tar.xz