From 2e1ec93595a1d2e7b5e4c1025c0a396da9c247cd Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 20 Aug 2022 17:35:08 +0200 Subject: [PATCH] - updated to 10.2.0 --- asciidoc.spec | 117 +++++++++++++++++++++++--------------------------- 1 file changed, 53 insertions(+), 64 deletions(-) diff --git a/asciidoc.spec b/asciidoc.spec index b213630..73f51a9 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -2,13 +2,13 @@ Summary: A tool for converting text files to various formats Summary(pl.UTF-8): Narzędzie do konwersji plików tekstowych do różnych formatów Name: asciidoc -Version: 9.1.0 -Release: 2 +Version: 10.2.0 +Release: 1 License: GPL v2+ Group: Applications/System -#Source0Download: https://github.com/asciidoc/asciidoc/releases +#Source0Download: https://github.com/asciidoc-py/asciidoc-py/releases Source0: https://github.com/asciidoc-py/asciidoc-py/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 52fc3849e1f48d8764337ce2b355b2ff +# Source0-md5: dce6bfe35fd2fe4fc71e1ca8c8ead683 URL: https://asciidoc.org/ BuildRequires: autoconf >= 2.50 BuildRequires: rpm-pythonprov @@ -21,8 +21,6 @@ Requires: xmlto BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define pkgconfdir %{_sysconfdir}/asciidoc - %description AsciiDoc is a text document format for writing short documents, articles, books and UNIX man pages. AsciiDoc files can be translated @@ -44,81 +42,72 @@ dostosowywane i rozszerzane przez użytkownika. %prep %setup -q -n %{name}-py-%{version} -%{__sed} -i -e '1s|^#!/usr/bin/env python3\?|#!%{__python3}|' asciidoc.py a2x.py \ - filters/code/code-filter.py \ - filters/latex/latex2img.py \ - filters/music/music2png.py \ - filters/graphviz/graphviz2png.py \ - filters/unwraplatex.py +%{__sed} -i -e '1s|/usr/bin/env python3|%{__python3}|' \ + asciidoc/resources/filters/code/code-filter.py \ + asciidoc/resources/filters/graphviz/graphviz2png.py \ + asciidoc/resources/filters/latex/latex2img.py \ + asciidoc/resources/filters/music/music2png.py \ + asciidoc/resources/filters/unwraplatex.py %build +# make man pages %{__autoconf} %configure - %{__make} +%py3_build + %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ - DESTDIR=$RPM_BUILD_ROOT - -# install directly instead of symlinks to .py -%{__mv} $RPM_BUILD_ROOT%{_bindir}/a2x{.py,} -%{__mv} $RPM_BUILD_ROOT%{_bindir}/asciidoc{.py,} -# move constant data to /usr -install -d $RPM_BUILD_ROOT%{_datadir}/%{name} -%{__mv} $RPM_BUILD_ROOT%{pkgconfdir}/{images,javascripts} $RPM_BUILD_ROOT%{_datadir}/%{name} -ln -sf %{_datadir}/%{name}/images $RPM_BUILD_ROOT%{pkgconfdir}/images -ln -sf %{_datadir}/%{name}/javascripts $RPM_BUILD_ROOT%{pkgconfdir}/javascripts - -%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/testasciidoc.1 +%py3_install -# if [ -d $VIM_RPM_BUILD_ROOT%{sysconfdir} ]; then -# install -d $VIM_RPM_BUILD_ROOT%{sysconfdir}/syntax -# install -m 644 vim/syntax/asciidoc.vim \ -# $VIM_RPM_BUILD_ROOT%{sysconfdir}/syntax/asciidoc.vim -# install -d $VIM_RPM_BUILD_ROOT%{sysconfdir}/ftdetect -# install -m 644 vim/ftdetect/asciidoc_filetype.vim \ -# $VIM_RPM_BUILD_ROOT%{sysconfdir}/ftdetect/asciidoc_filetype.vim -# fi +install -d $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p doc/a*.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc BUGS.txt CHANGELOG.txt COPYRIGHT README.asciidoc doc/asciidoc.txt +%doc BUGS.adoc CHANGELOG.adoc COPYRIGHT README.md doc/{asciidoc,asciidocapi,asciimath}.txt %attr(755,root,root) %{_bindir}/a2x %attr(755,root,root) %{_bindir}/asciidoc -%dir %{pkgconfdir} -%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/*.conf -%dir %{pkgconfdir}/dblatex -%{pkgconfdir}/dblatex/*.sty -%{pkgconfdir}/dblatex/*.xsl -%dir %{pkgconfdir}/docbook-xsl -%{pkgconfdir}/docbook-xsl/*.xsl -%dir %{pkgconfdir}/filters -%dir %{pkgconfdir}/filters/code -%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/filters/code/code-filter.conf -%attr(755,root,root) %{pkgconfdir}/filters/code/code-filter.py -%dir %{pkgconfdir}/filters/graphviz -%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/filters/graphviz/graphviz-filter.conf -%attr(755,root,root) %{pkgconfdir}/filters/graphviz/graphviz2png.py -%dir %{pkgconfdir}/filters/music -%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/filters/music/music-filter.conf -%attr(755,root,root) %{pkgconfdir}/filters/music/music2png.py -%dir %{pkgconfdir}/filters/source -%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/filters/source/source-highlight-filter.conf -%dir %{pkgconfdir}/filters/latex -%config(noreplace) %verify(not md5 mtime size) %{pkgconfdir}/filters/latex/latex-filter.conf -%attr(755,root,root) %{pkgconfdir}/filters/latex/latex2img.py -%attr(755,root,root) %{pkgconfdir}/filters/unwraplatex.py -%{pkgconfdir}/images -%{pkgconfdir}/javascripts -%dir %{pkgconfdir}/stylesheets -%{pkgconfdir}/stylesheets/*.css -%{pkgconfdir}/themes -%{_datadir}/%{name} +%dir %{py3_sitescriptdir}/asciidoc +%{py3_sitescriptdir}/asciidoc/*.py +%{py3_sitescriptdir}/asciidoc/__pycache__ +%{py3_sitescriptdir}/asciidoc/blocks +%dir %{py3_sitescriptdir}/asciidoc/resources +%{py3_sitescriptdir}/asciidoc/resources/*.conf +%{py3_sitescriptdir}/asciidoc/resources/dblatex +%{py3_sitescriptdir}/asciidoc/resources/docbook-xsl +%dir %{py3_sitescriptdir}/asciidoc/resources/filters +%attr(755,root,root) %{py3_sitescriptdir}/asciidoc/resources/filters/unwraplatex.py +%{py3_sitescriptdir}/asciidoc/resources/filters/__pycache__ +%dir %{py3_sitescriptdir}/asciidoc/resources/filters/code +%attr(755,root,root) %{py3_sitescriptdir}/asciidoc/resources/filters/code/code-filter.py +%{py3_sitescriptdir}/asciidoc/resources/filters/code/__pycache__ +%{py3_sitescriptdir}/asciidoc/resources/filters/code/*.conf +%{py3_sitescriptdir}/asciidoc/resources/filters/code/*.txt +%dir %{py3_sitescriptdir}/asciidoc/resources/filters/graphviz +%attr(755,root,root) %{py3_sitescriptdir}/asciidoc/resources/filters/graphviz/graphviz2png.py +%{py3_sitescriptdir}/asciidoc/resources/filters/graphviz/__pycache__ +%{py3_sitescriptdir}/asciidoc/resources/filters/graphviz/*.conf +%{py3_sitescriptdir}/asciidoc/resources/filters/graphviz/*.txt +%dir %{py3_sitescriptdir}/asciidoc/resources/filters/latex +%attr(755,root,root) %{py3_sitescriptdir}/asciidoc/resources/filters/latex/latex2img.py +%{py3_sitescriptdir}/asciidoc/resources/filters/latex/__pycache__ +%{py3_sitescriptdir}/asciidoc/resources/filters/latex/*.conf +%dir %{py3_sitescriptdir}/asciidoc/resources/filters/music +%attr(755,root,root) %{py3_sitescriptdir}/asciidoc/resources/filters/music/music2png.py +%{py3_sitescriptdir}/asciidoc/resources/filters/music/__pycache__ +%{py3_sitescriptdir}/asciidoc/resources/filters/music/*.conf +%{py3_sitescriptdir}/asciidoc/resources/filters/music/*.txt +%{py3_sitescriptdir}/asciidoc/resources/filters/source +%{py3_sitescriptdir}/asciidoc/resources/icons +%{py3_sitescriptdir}/asciidoc/resources/javascripts +%{py3_sitescriptdir}/asciidoc/resources/stylesheets +%{py3_sitescriptdir}/asciidoc/resources/themes +%{py3_sitescriptdir}/asciidoc-%{version}-py*.egg-info %{_mandir}/man1/a2x.1* %{_mandir}/man1/asciidoc.1* -- 2.44.0