rpms/asciidoc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Various rpmlint fixes

Browse Source 
The remaining errors are:

asciidoc.noarch: E: executable-marked-as-config-file /etc/asciidoc/filters/code/code-filter.py
asciidoc.noarch: E: executable-marked-as-config-file /etc/asciidoc/filters/graphviz/graphviz2png.py
asciidoc.noarch: E: incorrect-fsf-address /usr/share/doc/asciidoc/COPYING
asciidoc.noarch: E: incorrect-fsf-address /usr/share/doc/asciidoc/COPYRIGHT

The executable-marked-as-config-file errors are painful to fix without
listing the contents of /etc/asciidoc/ manually or restructuring the
install layout.  This is left as a future endeavor.

The incorrect-fsf-address errors will need to be addressed upstream.
This commit is contained in:
Todd Zullinger 2018-06-13 21:57:41 -04:00
parent 81d949eff9
commit baefb1894d
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
asciidoc.rpmlint Normal file
View File

@ -0,0 +1,28 @@
from Config import *
# The libxslt dependency is needed for /usr/bin/xsltproc
addFilter('asciidoc.noarch: E: explicit-lib-dependency libxslt')
# a2x.py and asciidoc.py and symlinked from a2x and asciidoc, respectively.
# Both commands have man-pages under their preferred names
addFilter('asciidoc.noarch: W: no-manual-page-for-binary a2x.py')
addFilter('asciidoc.noarch: W: no-manual-page-for-binary asciidoc.py')
# The dangling symlinks are all provided in asciidoc, which asciidoc-doc
# requires
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/dblatex ../../asciidoc/dblatex')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/docbook-xsl ../../asciidoc/docbook-xsl')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/ASCIIMathML.js ../../javascripts/ASCIIMathML.js')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/CHANGELOG.txt ../../CHANGELOG.txt')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/INSTALL.txt ../../INSTALL.txt')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/LaTeXMathML.js ../../javascripts/LaTeXMathML.js')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/README.txt ../../README.asciidoc')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/asciidoc.css ../../stylesheets/asciidoc.css')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/asciidoc.js ../../javascripts/asciidoc.js')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/examples/website/xhtml11-quirks.css ../../stylesheets/xhtml11-quirks.css')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/images ../../asciidoc/images')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/javascripts ../../asciidoc/javascripts')
addFilter('asciidoc-doc.noarch: W: dangling-relative-symlink /usr/share/doc/asciidoc/stylesheets ../../asciidoc/stylesheets')
# The latex and music subpackages don't have separate documentation
addFilter('asciidoc-(latex|music).noarch: W: no-documentation')

20
asciidoc.spec
View File

@ -75,13 +75,17 @@ Requires: lilypond
# Fix line endings on COPYRIGHT file # Fix line endings on COPYRIGHT file
sed -i "s/\r//g" COPYRIGHT sed -i "s/\r//g" COPYRIGHT
# Convert CHANGELOG and README to utf-8 # Convert README and dict files to utf-8
for file in README.asciidoc; do for file in README.asciidoc doc/*.dict examples/website/*.dict; do
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \ iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
touch -r $file $file.new && \ touch -r $file $file.new && \
mv $file.new $file mv $file.new $file
done done
# Fix python shebang
grep -rl '#!/usr/bin/env python' | xargs -r \
sed -i -e '1s@#!/usr/bin/env python3\?$@#!%{__python3}@'
%build %build
autoreconf -v autoreconf -v
%configure %configure
@ -104,9 +108,12 @@ for d in dblatex docbook-xsl images javascripts stylesheets; do
done done
# Python API # Python API
install -Dpm 644 asciidocapi.py %{buildroot}%{python3_sitelib}/asciidocapi.py mkdir -p %{buildroot}%{python3_sitelib}/
sed '1d' asciidocapi.py > %{buildroot}%{python3_sitelib}/asciidocapi.py
chmod -x %{buildroot}%{python3_sitelib}/asciidocapi.py
touch -r asciidocapi.py %{buildroot}%{python3_sitelib}/asciidocapi.py
# Make it easier to %exclude these with both rpm < and >= 4.7 # Make it easier to %%exclude these with both rpm < and >= 4.7
for file in %{buildroot}{%{_bindir},%{_sysconfdir}/asciidoc/filters/*}/*.py ; do for file in %{buildroot}{%{_bindir},%{_sysconfdir}/asciidoc/filters/*}/*.py ; do
touch ${file}{c,o} touch ${file}{c,o}
done done
@ -161,16 +168,17 @@ cd tests
%files latex %files latex
%dir %{_sysconfdir}/asciidoc/filters/latex %dir %{_sysconfdir}/asciidoc/filters/latex
%{_sysconfdir}/asciidoc/filters/latex/*.py %{_sysconfdir}/asciidoc/filters/latex/*.py
%{_sysconfdir}/asciidoc/filters/latex/*.conf %config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
%files music %files music
%dir %{_sysconfdir}/asciidoc/filters/music %dir %{_sysconfdir}/asciidoc/filters/music
%{_sysconfdir}/asciidoc/filters/music/*.conf %config(noreplace) %{_sysconfdir}/asciidoc/filters/music/*.conf
%{_sysconfdir}/asciidoc/filters/music/*.py %{_sysconfdir}/asciidoc/filters/music/*.py
%changelog %changelog
* Wed Jun 13 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.3.20180605git986f99d * Wed Jun 13 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.3.20180605git986f99d
- Use upstream tarball - Use upstream tarball
- Various rpmlint fixes
* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.2.20180605git986f99d * Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.2.20180605git986f99d
- Rebuilt for Python 3.7 - Rebuilt for Python 3.7