diff --git a/makefile b/makefile index f40b0c62..2260bbeb 100644 --- a/makefile +++ b/makefile @@ -342,7 +342,12 @@ rpm-package-suse15: check-rpm: rpmlint -f pkg/rpmlint.$(RPMOS) $(DSTDIR)/$(RPMPKG) -check-redhat: +check-redhat: check-rh8 check-rh9 + +check-rh8: + make check-rpm RPMOS=el OSREL=8 + +check-rh9: make check-rpm RPMOS=el OSREL=9 check-suse: diff --git a/pkg/rpmlint.el b/pkg/rpmlint.el index 6fe9106c..b4a36f2c 100644 --- a/pkg/rpmlint.el +++ b/pkg/rpmlint.el @@ -8,6 +8,11 @@ addFilter("non-standard-dir-perm /var/lib/weewx 2775") addFilter("non-standard-dir-perm /var/www/html/weewx 2775") addFilter("dangerous-command-in-%pre cp") addFilter("dangerous-command-in-%post mv") -addFilter("percent-in-%post") +# these are helper scripts that use /usr/bin/env +addFilter("wrong-script-interpreter .*/setup_mysql.sh") +addFilter("wrong-script-interpreter .*/i18n-report") +# logrotation is handled by weewx +addFilter("log-files-without-logrotate .*/var/log/weewx") # logwatch stuff belongs in /etc in case logwatch not installed +addFilter("non-executable-script /etc/weewx/logwatch/scripts/services/weewx") addFilter("executable-marked-as-config-file /etc/weewx/logwatch/scripts/services/weewx")