From 378e0e86d8d610a9ae5f67df5fd161b65594e6c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 29 Jan 2005 20:37:55 +0000
Subject: [PATCH] Update to 0.65, improve default config.

---
 .cvsignore            |  2 +-
 rpmlint-fedora-config |  6 +++---
 rpmlint.spec          | 36 +++++++++++++++++++++++++++++-------
 sources               |  2 +-
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a3ee591..a86b439 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpmlint-0.61.tar.bz2
+rpmlint-0.65.tar.bz2
diff --git a/rpmlint-fedora-config b/rpmlint-fedora-config
index eacc6c7..51f2274 100644
--- a/rpmlint-fedora-config
+++ b/rpmlint-fedora-config
@@ -6,12 +6,12 @@ from Config import *
 
 setOption("Vendor", "Fedora Linux")
 setOption("Distribution", "Fedora Linux")
-setOption("ReleaseExtension", "(\d+\.)+fdr\.\d+(\..*)?")
+setOption("ReleaseExtension", None)
 setOption("ValidBuildHost", ".*")
 setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
-setOption("UseEpoch", 1)
+setOption("UseEpoch", 0)
 setOption("ValidSrcPerms", (0644, ))
 setOption("ValidGroups", (
     "Amusements/Games",
@@ -78,5 +78,5 @@ setOption("ValidShells", (
 # Output filters
 addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependancy (perl|python)-base.*")
+addFilter("E: .* no-dependency (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
diff --git a/rpmlint.spec b/rpmlint.spec
index 1eaf89c..1d93e8b 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,18 +1,18 @@
 Name:           rpmlint
-Version:        0.61
-Release:        2
+Version:        0.65
+Release:        1
 Epoch:          0
 Summary:        RPM correctness checker
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://people.mandrakesoft.com/~flepied/projects/rpmlint/
-Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.61.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.65.tar.bz2
 Source1:        %{name}-fedora-config
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  python >= 0:1.5.2, rpm-python, make, perl
+BuildRequires:  python >= 0:1.5.2, rpm-python, make, %{__perl}
 Requires:       rpm-python, python >= 0:1.5.2, cpio
 
 %description
@@ -22,6 +22,8 @@ and source packages can be checked.
 
 %prep
 %setup -q
+%{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
+  FilesCheck.py I18NCheck.py
 
 
 %build
@@ -31,9 +33,10 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-
-# Install Fedora config as the default.
-install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 rpmlint.bash-completion $RPM_BUILD_ROOT%{_datadir}/rpmlint
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
 
 # Take care of files that may be generated later.
 touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
@@ -56,16 +59,35 @@ done
 rm -rf $RPM_BUILD_ROOT
 
 
+%triggerin -- bash-completion
+if [ ! -e %{_sysconfdir}/bash_completion.d/rpmlint ] ; then
+  ln -s %{_datadir}/rpmlint/rpmlint.bash-completion \
+    %{_sysconfdir}/bash_completion.d/rpmlint
+fi
+
+%triggerun -- bash-completion
+[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/rpmlint
+
+
 %files -f %{name}-%{version}-files.list
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/rpm*
 %dir %{_datadir}/rpmlint
+%{_datadir}/rpmlint/rpmlint.bash-completion
 %dir %{_sysconfdir}/rpmlint
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%ghost %{_sysconfdir}/bash_completion.d/rpmlint
 
 
 %changelog
+* Sat Jan 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.65-1
+- Update to 0.65.
+
+* Sat Jan  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.64-1
+- Update to 0.64.
+- Default config tweaks: don't mandate Epochs nor "fdr" in Release.
+
 * Tue Oct 19 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.61-0.fdr.2
 - Requires cpio (bug 2169).
 
diff --git a/sources b/sources
index a28c3fc..3663921 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e43509038848f1d8256a7ab2efe527b  rpmlint-0.61.tar.bz2
+7e238f5121e2451fc1e100a4f13f26f0  rpmlint-0.65.tar.bz2