Remove el4/el5 configs and /usr/bin symlinks
Both el4 and el5 have been unsupported for ages. Removing the /usr/bin symlinks also clears two rpmlint 'no-manual-page-for-binary' warnings.
This commit is contained in:
parent
dbfdbf0711
commit
68a527b440
@ -1,28 +0,0 @@
|
|||||||
# -*- python -*-
|
|
||||||
|
|
||||||
# System wide rpmlint default configuration. Do not modify, override/add
|
|
||||||
# options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed.
|
|
||||||
|
|
||||||
import os.path
|
|
||||||
import re
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from Config import *
|
|
||||||
import Pkg
|
|
||||||
|
|
||||||
# Inherit the base config and build from there.
|
|
||||||
exec(open("/usr/share/rpmlint/config","rb").read())
|
|
||||||
|
|
||||||
# Fedora 12 and newer no longer need a buildroot defined, to have the buildroot cleaned at the beginning
|
|
||||||
# of %install, and do not need to define a %clean section unless the default is invalid.
|
|
||||||
# However, EL-4 and EL-5 still need these checks.
|
|
||||||
removeFilter("no-cleaning-of-buildroot")
|
|
||||||
removeFilter("no-buildroot-tag")
|
|
||||||
removeFilter("no-%clean-section")
|
|
||||||
|
|
||||||
# Only EL4 needs the files-attr-not-set check, because rpm 4.4 and newer no longer need a %defattr line
|
|
||||||
# (it automatically provides one).
|
|
||||||
removeFilter("files-attr-not-set")
|
|
||||||
|
|
||||||
# Fixed in rpm >= 4.7.1
|
|
||||||
removeFilter("broken-syntax-in-scriptlet-requires")
|
|
@ -1,24 +0,0 @@
|
|||||||
# -*- python -*-
|
|
||||||
|
|
||||||
# System wide rpmlint default configuration. Do not modify, override/add
|
|
||||||
# options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed.
|
|
||||||
|
|
||||||
import os.path
|
|
||||||
import re
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from Config import *
|
|
||||||
import Pkg
|
|
||||||
|
|
||||||
# Inherit the base config and build from there.
|
|
||||||
exec(open("/usr/share/rpmlint/config","rb").read())
|
|
||||||
|
|
||||||
# Fedora 12 and newer no longer need a buildroot defined, to have the buildroot cleaned at the beginning
|
|
||||||
# of %install, and do not need to define a %clean section unless the default is invalid.
|
|
||||||
# However, EL-4 and EL-5 still need these checks.
|
|
||||||
removeFilter("no-cleaning-of-buildroot")
|
|
||||||
removeFilter("no-buildroot-tag")
|
|
||||||
removeFilter("no-%clean-section")
|
|
||||||
|
|
||||||
# Fixed in rpm >= 4.7.1
|
|
||||||
removeFilter("broken-syntax-in-scriptlet-requires")
|
|
12
rpmlint.spec
12
rpmlint.spec
@ -28,10 +28,6 @@ URL: https://github.com/rpm-software-management/rpmlint
|
|||||||
Source0: https://github.com/rpm-software-management/rpmlint/archive/rpmlint-%{version}.tar.gz
|
Source0: https://github.com/rpm-software-management/rpmlint/archive/rpmlint-%{version}.tar.gz
|
||||||
Source1: %{name}.config
|
Source1: %{name}.config
|
||||||
Source3: %{name}-etc.config
|
Source3: %{name}-etc.config
|
||||||
# EL-4 specific config
|
|
||||||
Source4: %{name}.config.el4
|
|
||||||
# EL-5 specific config
|
|
||||||
Source5: %{name}.config.el5
|
|
||||||
# https://github.com/rpm-software-management/rpmlint/commit/e739876
|
# https://github.com/rpm-software-management/rpmlint/commit/e739876
|
||||||
Patch0: rpmlint-1.10-ignore-debuginfo-useless-provides.patch
|
Patch0: rpmlint-1.10-ignore-debuginfo-useless-provides.patch
|
||||||
# https://github.com/rpm-software-management/rpmlint/commit/b748e6fadb8e68df2aa679ccf62822ad56577b80
|
# https://github.com/rpm-software-management/rpmlint/commit/b748e6fadb8e68df2aa679ccf62822ad56577b80
|
||||||
@ -115,12 +111,6 @@ make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
|
|||||||
LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir} PYTHON=%{python}
|
LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir} PYTHON=%{python}
|
||||||
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
|
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
|
||||||
|
|
||||||
install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config.el4
|
|
||||||
install -pm 644 %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config.el5
|
|
||||||
pushd $RPM_BUILD_ROOT%{_bindir}
|
|
||||||
ln -s rpmlint el4-rpmlint
|
|
||||||
ln -s rpmlint el5-rpmlint
|
|
||||||
popd
|
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/
|
rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/
|
||||||
%endif
|
%endif
|
||||||
@ -142,7 +132,6 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
%{_bindir}/rpmdiff
|
%{_bindir}/rpmdiff
|
||||||
%{_bindir}/el*-rpmlint
|
|
||||||
%{_bindir}/rpmlint
|
%{_bindir}/rpmlint
|
||||||
%{_datadir}/rpmlint/
|
%{_datadir}/rpmlint/
|
||||||
%{_mandir}/man1/rpmdiff.1*
|
%{_mandir}/man1/rpmdiff.1*
|
||||||
@ -151,6 +140,7 @@ make check PYTHON=%{python} PYTEST=%{pytest} FLAKE8=%{flake8}
|
|||||||
%changelog
|
%changelog
|
||||||
* Sun Jun 17 2018 Todd Zullinger <tmz@pobox.com> - 1.10-15
|
* Sun Jun 17 2018 Todd Zullinger <tmz@pobox.com> - 1.10-15
|
||||||
- Fix mixed-use-of-spaces-and-tabs warning (in this spec file)
|
- Fix mixed-use-of-spaces-and-tabs warning (in this spec file)
|
||||||
|
- Remove el4/el5 configs and /usr/bin symlinks
|
||||||
|
|
||||||
* Tue Jun 12 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10-14
|
* Tue Jun 12 2018 Miro Hrončok <mhroncok@redhat.com> - 1.10-14
|
||||||
- apply upstream fix for python 3.7 new magic numbers
|
- apply upstream fix for python 3.7 new magic numbers
|
||||||
|
Loading…
Reference in New Issue
Block a user