0.70, improve config, fix non-config message, non-enabled services are
good.
This commit is contained in:
parent
c768a45a1a
commit
e7dcfc009e
@ -1 +1 @@
|
|||||||
rpmlint-0.69.tar.bz2
|
rpmlint-0.70.tar.bz2
|
||||||
|
20
rpmlint-confmsg.patch
Normal file
20
rpmlint-confmsg.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
Index: FilesCheck.py
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cooker/soft/rpmlint/FilesCheck.py,v
|
||||||
|
retrieving revision 1.87
|
||||||
|
diff -u -r1.87 FilesCheck.py
|
||||||
|
--- FilesCheck.py 17 Jun 2005 09:48:34 -0000 1.87
|
||||||
|
+++ FilesCheck.py 20 Jun 2005 10:30:43 -0000
|
||||||
|
@@ -692,9 +692,9 @@
|
||||||
|
Please remove it and rebuild your package.''',
|
||||||
|
|
||||||
|
'non-conffile-in-etc',
|
||||||
|
-'''A file in your package is being installed in /etc, but is not a
|
||||||
|
-configuration file. All the files in /etc MUST be configuration files
|
||||||
|
-(add the %config option to the file in the spec file).''',
|
||||||
|
+'''A non-executable file in your package is being installed in /etc, but is not
|
||||||
|
+a configuration file. All non-executable files in /etc should be configuration
|
||||||
|
+files. Mark the file as %config in the spec file.''',
|
||||||
|
|
||||||
|
'compressed-symlink-with-wrong-ext',
|
||||||
|
'''The symlink points to a compressed file but doesn't use the same extension.''',
|
@ -27,6 +27,7 @@ setOption("ValidGroups", (
|
|||||||
"Applications/Publishing",
|
"Applications/Publishing",
|
||||||
"Applications/System",
|
"Applications/System",
|
||||||
"Applications/Text",
|
"Applications/Text",
|
||||||
|
"Development/Debug", # intended for debuginfo packages only
|
||||||
"Development/Debuggers",
|
"Development/Debuggers",
|
||||||
"Development/Languages",
|
"Development/Languages",
|
||||||
"Development/Libraries",
|
"Development/Libraries",
|
||||||
@ -79,15 +80,16 @@ addFilter("W: .* source-or-patch-not-[bg]zipped .*")
|
|||||||
addFilter("E: .* lib-package-without-%mklibname")
|
addFilter("E: .* lib-package-without-%mklibname")
|
||||||
addFilter("E: .* no-dependency-on (perl|python)-base.*")
|
addFilter("E: .* no-dependency-on (perl|python)-base.*")
|
||||||
addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
|
addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
|
||||||
addFilter("W: .* invalid-distribution .*")
|
addFilter("W: .* invalid-(distribution|vendor) .*")
|
||||||
addFilter("W: .* invalid-vendor .*")
|
addFilter("E: .* no-(packager-tag|signature)")
|
||||||
addFilter("E: .* incoherent-version-in-name.*")
|
addFilter("E: .* incoherent-version-in-name.*")
|
||||||
addFilter("E: .* invalid-build-requires .*")
|
addFilter("E: .* invalid-build-requires .*")
|
||||||
addFilter("E: .* no-packager-tag")
|
|
||||||
addFilter("W: .* ghost-files-without-postin")
|
addFilter("W: .* ghost-files-without-postin")
|
||||||
addFilter("W: .* postin-without-ghost-file-creation .*")
|
addFilter("W: .* postin-without-ghost-file-creation .*")
|
||||||
addFilter("W: .* no-major-in-name .*")
|
addFilter("W: .* no-major-in-name .*")
|
||||||
addFilter("E: .* executable-in-library-package .*")
|
addFilter("E: .* executable-in-library-package .*")
|
||||||
addFilter("E: .* no-signature")
|
|
||||||
addFilter("E: .* non-versioned-file-in-library-package .*")
|
addFilter("E: .* non-versioned-file-in-library-package .*")
|
||||||
addFilter("E: .* requires-on-release .*")
|
addFilter("E: .* requires-on-release .*")
|
||||||
|
addFilter("W: .* jar-not-indexed .*")
|
||||||
|
addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
|
||||||
|
addFilter("E: .* outside-libdir-files .*")
|
||||||
|
30
rpmlint-svcdefault.patch
Normal file
30
rpmlint-svcdefault.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
Index: InitScriptCheck.py
|
||||||
|
===================================================================
|
||||||
|
RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v
|
||||||
|
retrieving revision 1.14
|
||||||
|
diff -u -r1.14 InitScriptCheck.py
|
||||||
|
--- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14
|
||||||
|
+++ InitScriptCheck.py 20 Jun 2005 10:20:15 -0000
|
||||||
|
@@ -74,8 +74,8 @@
|
||||||
|
if not res:
|
||||||
|
printError(pkg, 'no-chkconfig-line', f)
|
||||||
|
else:
|
||||||
|
- if res.group(1) == '-':
|
||||||
|
- printWarning(pkg, 'no-default-runlevel')
|
||||||
|
+ if res.group(1) != '-':
|
||||||
|
+ printWarning(pkg, 'service-default-enabled', f)
|
||||||
|
|
||||||
|
res=subsys_regex.search(content)
|
||||||
|
if not res:
|
||||||
|
@@ -126,8 +126,9 @@
|
||||||
|
'''The init script doesn't contain a chkconfig line to specify the runlevels at which
|
||||||
|
to start and stop it.''',
|
||||||
|
|
||||||
|
-'no-default-runlevel',
|
||||||
|
-'''The default runlevel isn't specified in the init script.''',
|
||||||
|
+'service-default-enabled',
|
||||||
|
+'''The service is enabled by default after "chkconfig --add"; most services
|
||||||
|
+should not be. Use "-" to correct this if appropriate.''',
|
||||||
|
|
||||||
|
'subsys-not-used',
|
||||||
|
'''While your program is running, you have to put a lock file in
|
37
rpmlint.spec
37
rpmlint.spec
@ -1,18 +1,24 @@
|
|||||||
Name: rpmlint
|
Name: rpmlint
|
||||||
Version: 0.69
|
Version: 0.70
|
||||||
Release: 3
|
Release: 3
|
||||||
Summary: Tool for checking common errors in RPM packages
|
Summary: Tool for checking common errors in RPM packages
|
||||||
|
|
||||||
Group: Development/Tools
|
Group: Development/Tools
|
||||||
License: GPL
|
License: GPL
|
||||||
URL: http://people.mandrakesoft.com/~flepied/projects/rpmlint/
|
URL: http://people.mandriva.com/~flepied/projects/rpmlint/
|
||||||
Source0: http://people.mandrakesoft.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
|
Source0: http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
|
||||||
Source1: %{name}-fedora-config
|
Source1: %{name}-fedora-config
|
||||||
|
Patch0: %{name}-svcdefault.patch
|
||||||
|
Patch1: %{name}-confmsg.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: python >= 1.5.2, rpm-python, make, %{__perl}
|
BuildRequires: python >= 1.5.2
|
||||||
Requires: rpm-python, python >= 1.5.2, cpio
|
BuildRequires: rpm-python
|
||||||
|
BuildRequires: sed >= 3.95
|
||||||
|
Requires: rpm-python
|
||||||
|
Requires: python >= 1.5.2
|
||||||
|
Requires: cpio
|
||||||
|
|
||||||
%description
|
%description
|
||||||
rpmlint is a tool for checking common errors in RPM packages. Binary
|
rpmlint is a tool for checking common errors in RPM packages. Binary
|
||||||
@ -21,7 +27,9 @@ and source packages can be checked.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%{__perl} -pi -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
|
%patch0
|
||||||
|
%patch1
|
||||||
|
sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
|
||||||
FilesCheck.py I18NCheck.py
|
FilesCheck.py I18NCheck.py
|
||||||
for f in AUTHORS ChangeLog ; do
|
for f in AUTHORS ChangeLog ; do
|
||||||
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
|
iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
|
||||||
@ -64,15 +72,24 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%defattr(-,root,root,0755)
|
%defattr(-,root,root,0755)
|
||||||
%doc AUTHORS COPYING ChangeLog README
|
%doc AUTHORS COPYING ChangeLog README
|
||||||
%{_bindir}/rpm*
|
%{_bindir}/rpm*
|
||||||
%dir %{_datadir}/rpmlint
|
%dir %{_datadir}/rpmlint/
|
||||||
%exclude %{_datadir}/rpmlint/check-install.py*
|
%exclude %{_datadir}/rpmlint/check-install.py*
|
||||||
%dir %{_sysconfdir}/rpmlint
|
%dir %{_sysconfdir}/rpmlint/
|
||||||
%config(noreplace) %{_sysconfdir}/rpmlint/config
|
%config(noreplace) %{_sysconfdir}/rpmlint/config
|
||||||
# Not config (yet?) to achieve clean upgrade from pre-0.69.
|
%{_sysconfdir}/bash_completion.d/
|
||||||
%{_sysconfdir}/bash_completion.d
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-3
|
||||||
|
- 0.70, use sed instead of perl during build.
|
||||||
|
- Default configuration improvements: allow Development/Debug group (for
|
||||||
|
debuginfo packages), filter out errors/warnings about non-indexed jars,
|
||||||
|
invalid LC_MESSAGES and man page dirs, and library packages containing
|
||||||
|
something else in addition to libraries.
|
||||||
|
- Make info about non-config files in /etc more accurate.
|
||||||
|
- Patch to warn about services that default to enabled after "chkconfig add",
|
||||||
|
not the other way around.
|
||||||
|
|
||||||
* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.69-3
|
* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.69-3
|
||||||
- Filter out more not-that-useful messages in the default config.
|
- Filter out more not-that-useful messages in the default config.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user