[rpmlint/f14/master] update to 1.2, filter out files-attr-not-set except for el4

[Tom Callaway]

commit d6368ca174146b3a6dd7ed38c2bce2a768b27323
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Sun Apr 24 21:57:54 2011 -0400

    update to 1.2, filter out files-attr-not-set except for el4

 rpmlint.config     |    3 +++
 rpmlint.config.el4 |    4 ++++
 rpmlint.spec       |   34 ++++++++++++++++++++--------------
 sources            |    2 +-
 4 files changed, 28 insertions(+), 15 deletions(-)
---
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 bf8798b..667e1b8 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,21 +1,20 @@
 Name:           rpmlint
-Version:        1.0
-Release:        3%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://rpmlint.zarb.org/
-Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.xz
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
 Source3:        %{name}-etc.config
 # EL-4 specific config
-Source4:	%{name}.config.el4
+Source4:        %{name}.config.el4
 # EL-5 specific config
-Source5:	%{name}.config.el5
+Source5:        %{name}.config.el5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python >= 4.4
@@ -63,14 +62,8 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config.el4
 install -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config.el5
 pushd $RPM_BUILD_ROOT%{_bindir}
-cp -a rpmlint el4-rpmlint
-sed -i 's|rpmlint.py|el4-rpmlint.py|g' el4-rpmlint
-cp -a rpmlint el5-rpmlint
-sed -i 's|rpmlint.py|el5-rpmlint.py|g' el5-rpmlint
-popd
-pushd $RPM_BUILD_ROOT%{_datadir}/rpmlint
-ln -s rpmlint.py el4-rpmlint.py
-ln -s rpmlint.py el5-rpmlint.py
+ln -s rpmlint el4-rpmlint
+ln -s rpmlint el5-rpmlint
 popd
 
 %check
@@ -95,6 +88,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 24 2011 Tom Callaway <spot at 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 at fedoraproject.org> - 1.1-3
+- apply upstream fix for source url aborts (bz 680781)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Feb  4 2011 Tom Callaway <spot at fedoraproject.org> - 1.1-1
+- update to 1.1
+
 * Tue Dec  7 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0-3
 - fix typo in changelog
 - %% comment out item in changelog
diff --git a/sources b/sources
index f857008..3ec254f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c27b574f3e70a3ffeb8eeb550e597c2d  rpmlint-1.0.tar.bz2
+adc01e86aa1ebb8a93d162bbac238444  rpmlint-1.2.tar.xz