From 3347761d182dac95caf89416d45142f4800fa8f1 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 5 Dec 2011 14:35:57 -0500
Subject: [PATCH] 1.4, filter non-ghost-in-var-(lock|run)

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

diff --git a/.gitignore b/.gitignore
index 7dee4a1..27b34bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /rpmlint-1.1.tar.xz
 /rpmlint-1.2.tar.xz
 /rpmlint-1.3.tar.xz
+/rpmlint-1.4.tar.xz
diff --git a/rpmlint.config b/rpmlint.config
index 75a450a..05ca3c9 100644
--- a/rpmlint.config
+++ b/rpmlint.config
@@ -363,6 +363,10 @@ 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")
+# Don't bother with the non-ghost-in-var-(lock|run) checks on Fedora 15 or newer
+# since they have tmpfs /var/lock and /var/run.
+addFilter("non-ghost-in-var-lock") 
+addFilter("non-ghost-in-var-run")
 # 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.spec b/rpmlint.spec
index 8ec8dc8..a51733b 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        1.3
-Release:        2%{?dist}
+Version:        1.4
+Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -14,9 +14,6 @@ Source3:        %{name}-etc.config
 Source4:        %{name}.config.el4
 # EL-5 specific config
 Source5:        %{name}.config.el5
-# http://rpmlint.zarb.org/cgi-bin/trac.cgi/changeset/1886
-# https://bugzilla.redhat.com/show_bug.cgi?id=745446
-Patch0:		rpmlint-1.3-svn1886-ghost-fix.patch
 BuildArch:      noarch
 BuildRequires:  python >= 2.4
 BuildRequires:  rpm-python >= 4.4
@@ -44,7 +41,6 @@ and source packages as well as spec files can be checked.
 
 %prep
 %setup -q
-%patch0 -p1 -b .ghostfix
 sed -i -e /MenuCheck/d Config.py
 cp -p config config.example
 install -pm 644 %{SOURCE2} CHANGES.package.old
@@ -75,7 +71,11 @@ make check
 %files
 %doc AUTHORS COPYING ChangeLog CHANGES.package.old README config.example
 %config(noreplace) %{_sysconfdir}/rpmlint/
+%if 0%{?fedora} >= 17
+%{_datadir}/bash-completion/completions/
+%else
 %{_sysconfdir}/bash_completion.d/
+%endif
 %{_bindir}/rpmdiff
 %{_bindir}/el*-rpmlint
 %{_bindir}/rpmlint
@@ -85,6 +85,9 @@ make check
 
 
 %changelog
+* Mon Dec  5 2011 Tom Callaway <spot@fedoraproject.org> - 1.4-1
+- update to 1.4
+
 * Wed Oct 12 2011 Tom Callaway <spot@fedoraproject.org> - 1.3-2
 - apply upstream fix for false error on checking ghosted man pages for 
   encoding (bz745446)
diff --git a/sources b/sources
index 78f6659..6c271e9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-afe1b906776d1ab8148888c25fd31006  rpmlint-1.3.tar.xz
+bfbdd78847ca2b253c2e4e65c41f49e2  rpmlint-1.4.tar.xz