From de33c606e4876290264518ef5e47196263350297 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Feb 13 2005 19:28:58 +0000
Subject: 0.67, improve default config.


---

diff --git a/.cvsignore b/.cvsignore
index a86b439..967fd48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rpmlint-0.65.tar.bz2
+rpmlint-0.67.tar.bz2
diff --git a/rpmlint-fedora-config b/rpmlint-fedora-config
index 51f2274..378c403 100644
--- a/rpmlint-fedora-config
+++ b/rpmlint-fedora-config
@@ -4,9 +4,9 @@
 
 from Config import *
 
-setOption("Vendor", "Fedora Linux")
-setOption("Distribution", "Fedora Linux")
-setOption("ReleaseExtension", None)
+#setOption("Vendor", "Fedora Extras")
+#setOption("Distribution", "Fedora Extras")
+setOption("ReleaseExtension", '')
 setOption("ValidBuildHost", ".*")
 setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
@@ -80,3 +80,5 @@ addFilter("W: .* source-or-patch-not-[bg]zipped .*")
 addFilter("E: .* lib-package-without-%mklibname")
 addFilter("E: .* no-dependency (perl|python)-base.*")
 addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
+addFilter("W: .* invalid-distribution .*")
+addFilter("W: .* invalid-vendor .*")
diff --git a/rpmlint-siteperl.patch b/rpmlint-siteperl.patch
new file mode 100644
index 0000000..d2e5b61
--- /dev/null
+++ b/rpmlint-siteperl.patch
@@ -0,0 +1,16 @@
+Index: FilesCheck.py
+===================================================================
+RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
+retrieving revision 1.82
+diff -u -r1.82 FilesCheck.py
+--- FilesCheck.py	11 Feb 2005 08:32:23 -0000	1.82
++++ FilesCheck.py	13 Feb 2005 19:04:57 -0000
+@@ -181,7 +181,7 @@
+ lib_package_regex=re.compile('^(lib|.+-libs)')
+ hidden_file_regex=re.compile('/\.[^/]*$')
+ mispelled_macro_regex=re.compile('%{.*}')
+-siteperl_perl_regex=re.compile('^/usr/lib/perl5/site_perl/')
++siteperl_perl_regex=re.compile('/site_perl/')
+ manifest_perl_regex=re.compile('^/usr/share/doc/perl-.*/MANIFEST(\.SKIP)?$');
+ shellbang_regex=re.compile('^#!\s*(\S*)')
+ interpreter_regex=re.compile('^/(usr/)?bin/[^/]+$')
diff --git a/rpmlint.spec b/rpmlint.spec
index 1d93e8b..561d4e9 100644
--- a/rpmlint.spec
+++ b/rpmlint.spec
@@ -1,5 +1,5 @@
 Name:           rpmlint
-Version:        0.65
+Version:        0.67
 Release:        1
 Epoch:          0
 Summary:        RPM correctness checker
@@ -7,8 +7,9 @@ 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.65.tar.bz2
+Source0:        http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/rpmlint-0.67.tar.bz2
 Source1:        %{name}-fedora-config
+Patch0:         %{name}-siteperl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,6 +23,7 @@ and source packages can be checked.
 
 %prep
 %setup -q
+%patch0
 %{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
 
@@ -81,6 +83,12 @@ fi
 
 
 %changelog
+* Sun Feb 13 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.67-1
+- 0.67.
+- Patch to catch more site_perl directories.
+- Default config improvements: filter Distribution and Vendor warnings,
+  use empty string instead of None for release extension (fixes -i).
+
 * Sat Jan 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0:0.65-1
 - Update to 0.65.
 
diff --git a/sources b/sources
index 3663921..9c76f99 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e238f5121e2451fc1e100a4f13f26f0  rpmlint-0.65.tar.bz2
+5b3e0d8eb10b6013d8987ce5a180c7ae  rpmlint-0.67.tar.bz2