From aa00349dddb5df99bf50060889034df3c448d07b Mon Sep 17 00:00:00 2001
From: Manuel Wolfshant <wolfy@fedoraproject.org>
Date: Mar 02 2009 13:28:06 +0000
Subject: bump to release 0.85, sync with EL-5


---

diff --git a/.cvsignore b/.cvsignore
index 51845c6..8f3299f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-rpmlint-0.84.tar.bz2
-rpmlint-0.84-distregex.patch
+rpmlint-0.85.tar.bz2
+rpmlint-0.85-compile.patch
+rpmlint-0.85-configs.patch
diff --git a/rpmlint.spec b/rpmlint.spec
index 1e317a1..9a579b1 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,6 +1,6 @@
 Name:           rpmlint
-Version:        0.84
-Release:        3%{?dist}
+Version:        0.85
+Release:        3%{?dist}.1
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
@@ -9,8 +9,11 @@ URL:            http://rpmlint.zarb.org/
 Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}.config
 Source2:        %{name}-CHANGES.package.old
-Patch0:         %{name}-0.84-distregex.patch
-Patch1:         %{name}-0.77-compile.patch
+Source3:        %{name}-etc.config
+# Fedora specific, not upstreamable
+Patch0:         %{name}-0.85-compile.patch
+# From upstream svn
+Patch1:         %{name}-0.85-configs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,9 +35,10 @@ and source packages can be checked.
 %prep
 %setup -q
 %patch0 -p1
-%patch1
+%patch1 -p0
 sed -i -e /MenuCheck/d Config.py
 install -pm 644 %{SOURCE2} CHANGES.package.old
+install -pm 644 %{SOURCE3} config
 
 
 %build
@@ -46,8 +50,6 @@ rm -rf $RPM_BUILD_ROOT
 touch rpmlint.pyc rpmlint.pyo # just for the %%exclude to work everywhere
 make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
   LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
-echo "# Add local system wide rpmlint configuration here." \
-  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 
@@ -68,6 +70,18 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Feb 05 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.85-3.1
+- Bump release to express relationship with the rawhide version.
+  No other changes.
+
+* Sat Jan 24 2009 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.85-1
+- Sync with Fedora rawhide version 0.85-3, including:
+-- Update to upstream version 0.85
+-- Apply upstream patch to load all *config from /etc/rpmlint.
+- Sync Fedora license list as Wiki revision 1.34
+- Filter out "filename-too-long-for-joliet" and "symlink-should-be-*"
+   warnings in default config.
+
 * Sat Oct  18 2008 Manuel Wolfshant <wolfy at fedoraproject.org> - 0.84-3
 - Sync Fedora license list with Wiki revision 1.09
 
diff --git a/sources b/sources
index 1318baa..4b23da4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-d7e2aab6135a44a845f677d27f2722bd  rpmlint-0.84.tar.bz2
-4a6a0894e3f1a305464cb651b629af30  rpmlint-0.84-distregex.patch
+a9344017826f709328c63192c5a727ec  rpmlint-0.85.tar.bz2
+92915e2bcbaccaaa0a2237183dd87762  rpmlint-0.85-compile.patch
+b19d6406ceeec7a6ed6ebe6bd7b16faf  rpmlint-0.85-configs.patch