Author: glen Date: Sun Jan 9 19:56:07 2011 GMT Module: packages Tag: HEAD ---- Log message: - add system wide config, instead of config patching - run tests
---- Files affected: packages/rpmlint: rpmlint.spec (1.30 -> 1.31) , rpmlint-etc.config (NONE -> 1.1) (NEW), rpmlint.config (NONE -> 1.1) (NEW), rpmlint-config.patch (1.4 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/rpmlint/rpmlint.spec diff -u packages/rpmlint/rpmlint.spec:1.30 packages/rpmlint/rpmlint.spec:1.31 --- packages/rpmlint/rpmlint.spec:1.30 Sun Jan 9 20:14:03 2011 +++ packages/rpmlint/rpmlint.spec Sun Jan 9 20:56:02 2011 @@ -1,14 +1,19 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without tests # build without tests + Summary: Tool for checking common errors in RPM packages Name: rpmlint Version: 1.0 -Release: 2 +Release: 3 License: GPL v2 Group: Development/Building Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 # Source0-md5: c27b574f3e70a3ffeb8eeb550e597c2d +Source1: %{name}.config +Source3: %{name}-etc.config Patch0: %{name}-groups.patch -Patch1: %{name}-config.patch Patch2: %{name}-licenses.patch Patch3: rpm-compat.patch Patch4: pythonpath.patch @@ -53,12 +58,14 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 +cp -p config config.example +cp -p %{SOURCE3} config + cat <<'EOF' > rpmlint #!/bin/sh exec python -tt -u -O %{py_sitescriptdir}/%{name}/rpmlint.pyc "$@" @@ -72,6 +79,10 @@ %{__make} \ COMPILE_PYC=1 +%if %{with tests} +%{__make} check +%endif + %install rm -rf $RPM_BUILD_ROOT %{__make} install \ @@ -83,6 +94,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a GROUPS $RPM_BUILD_ROOT%{_datadir}/%{name} +cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/%{name}/config %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} @@ -93,16 +105,17 @@ %files %defattr(644,root,root,755) -%doc AUTHORS ChangeLog README* +%doc AUTHORS ChangeLog README* config.example %dir %{_sysconfdir}/rpmlint %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rpmlint/config %attr(755,root,root) %{_bindir}/rpmdiff %attr(755,root,root) %{_bindir}/rpmlint %{_mandir}/man1/rpmlint.1* -%dir %{_datadir}/rpmlint -%{_datadir}/rpmlint/GROUPS -%dir %{py_sitescriptdir}/rpmlint -%{py_sitescriptdir}/rpmlint/*.py[co] +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/GROUPS +%{_datadir}/%{name}/config +%dir %{py_sitescriptdir}/%{name} +%{py_sitescriptdir}/%{name}/*.py[co] %files -n bash-completion-%{name} %defattr(644,root,root,755) @@ -114,6 +127,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.31 2011/01/09 19:56:02 glen +- add system wide config, instead of config patching +- run tests + Revision 1.30 2011/01/09 19:14:03 glen - fix arguments count to versionToString; rel 2 ================================================================ Index: packages/rpmlint/rpmlint-etc.config diff -u /dev/null packages/rpmlint/rpmlint-etc.config:1.1 --- /dev/null Sun Jan 9 20:56:07 2011 +++ packages/rpmlint/rpmlint-etc.config Sun Jan 9 20:56:02 2011 @@ -0,0 +1,2 @@ +# Add local system wide rpmlint configuration here or in other *config files +# in this directory. ================================================================ Index: packages/rpmlint/rpmlint.config diff -u /dev/null packages/rpmlint/rpmlint.config:1.1 --- /dev/null Sun Jan 9 20:56:07 2011 +++ packages/rpmlint/rpmlint.config Sun Jan 9 20:56:02 2011 @@ -0,0 +1,25 @@ +# -*- python -*- +# System wide rpmlint default configuration. Do not modify, override/add +# options in /etc/rpmlint/config and/or ~/.config/rpmlint as needed. + +import os.path +import re +import sys + +from Config import * +import Pkg + +setOption("CompressExtension", "gz") +setOption("UseVersionInChangeLog", False) + +# Output filters +addFilter("W: macro-in-%changelog") + +# known suid programs +for pkg, exe in ( + ("coreutils", "/bin/su"), + ("pwdutils", "/usr/bin/passwd"), + ("sudo", "/usr/bin/sudo(edit)?"), + ): + addFilter("%s.* (setuid-binary|non-standard-executable-perm) %s (root )?04" + % (pkg, exe)) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpmlint/rpmlint.spec?r1=1.30&r2=1.31&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
