diff --git a/asciidoc-10.1.4.tar.gz b/asciidoc-10.1.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..34559ebe437bc873ab383aa5fecf2b4653085986 Binary files /dev/null and b/asciidoc-10.1.4.tar.gz differ diff --git a/asciidoc-py-9.1.1.tar.gz b/asciidoc-py-9.1.1.tar.gz deleted file mode 100644 index 7a6f63f6948674659b8497be40f76c908eb1654f..0000000000000000000000000000000000000000 Binary files a/asciidoc-py-9.1.1.tar.gz and /dev/null differ diff --git a/asciidoc.spec b/asciidoc.spec index 713fc60ddfaa242b44bf6bb6d9d7da69b84ddec2..30254c696f97cd51dcc982aa4deba7df7fc4d367 100644 --- a/asciidoc.spec +++ b/asciidoc.spec @@ -1,13 +1,14 @@ Name: asciidoc -Version: 9.1.1 +Version: 10.1.4 Release: 1 Summary: Python 3 port of Asciidoc Python. License: GPLv2 URL: http://asciidoc.org -Source0: https://github.com/%{name}-py/asciidoc-py/archive/%{version}/%{name}-py-%{version}.tar.gz +Source0: https://github.com/%{name}-py/asciidoc-py/release/download/%{version}/%{name}-%{version}.tar.gz BuildRequires: python3-devel docbook-style-xsl graphviz libxslt source-highlight BuildRequires: texlive-dvisvgm-bin vim-filesystem symlinks automake autoconf +BuildRequires: fdupes python3-pytest python3-pytest-mock Requires: python3 docbook-style-xsl graphviz libxslt source-highlight vim-filesystem Requires: %{name} = %{version}-%{release} @@ -28,49 +29,24 @@ Obsoletes: %{name}-doc < %{version}-%{release} Provides: %{name}-doc = %{version}-%{release} %prep -%autosetup -n %{name}-py-%{version} +%autosetup -n %{name}-%{version} %build -autoreconf -v -%configure -%make_build +python3 setup.py build %install -make install docs DESTDIR=%{buildroot} -install -d -m 755 %{buildroot}%{_datadir}/%{name}/ -for d in docbook-xsl images javascripts stylesheets; do - mv -v %{buildroot}%{_sysconfdir}/%{name}/$d %{buildroot}%{_datadir}/%{name}/ - ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/ - rm -rf %{buildroot}%{_docdir}/%{name}/$d - ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/ -done - -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 - -for file in %{buildroot}{%{_bindir},%{_sysconfdir}/%{name}/filters/*}/*.py ; do - touch ${file}{c,o} -done - -mkdir -p %{buildroot}/%{_datadir}/vim/vimfiles/{ftdetect,syntax} -for file in $(cd vim; find * -type f); do - install -m 0644 vim/$file %{buildroot}/%{_datadir}/vim/vimfiles/$file -done - -symlinks -cdr %{buildroot} - -# Clean up no needed doc files -rm -f %{buildroot}/%{_pkgdocdir}/INSTALL.txt -rm -f %{buildroot}/%{_mandir}/man1/testasciidoc.1* +python3 setup.py install --prefix=%_prefix --root=%buildroot +mkdir -p %{buildroot}%{_mandir}/man1/ +cp -a doc/*.1 %{buildroot}%{_mandir}/man1/ + +%fdupes %{buildroot}%{python3_sitelib}/%{name} %check -export PATH="../:$PATH" -cd tests -%{__python3} testasciidoc.py update -%{__python3} testasciidoc.py run -cd .. +export PYTHONPATH="$PYTHONPATH:%{buildroot}%{python3_sitelib}" +export PYTHONDONTWRITEBYTECODE=1 +python3 -m asciidoc.asciidoc --doctest +python3 -m pytest --ignore=_build.python3 -v +python3 tests/testasciidoc.py run %pre @@ -81,38 +57,22 @@ cd .. %postun %files -%doc BUGS.txt CHANGELOG.txt README.asciidoc -%license COPYRIGHT -%config(noreplace) %{_sysconfdir}/%{name}/ -%dir %{_sysconfdir}/%{name}/filters/latex -%{_sysconfdir}/%{name}/filters/latex/*.py -%config(noreplace) %{_sysconfdir}/%{name}/filters/latex/*.conf -%dir %{_sysconfdir}/%{name}/filters/music -%config(noreplace) %{_sysconfdir}/%{name}/filters/music/*.conf -%{_sysconfdir}/%{name}/filters/music/*.py +%doc README.md BUGS.adoc CHANGELOG.adoc +%license COPYRIGHT LICENSE %{_bindir}/a2x -%{_bindir}/a2x.py %{_bindir}/%{name} -%{_bindir}/asciidoc.py -%{_datadir}/%{name}/ %{python3_sitelib}/ -%exclude %{_bindir}/*.py[co] -%exclude %{_sysconfdir}/%{name}/filters/*/*.py[co] -%exclude %{_pkgdocdir}/doc -%exclude %{_pkgdocdir}/website -%exclude %{_pkgdocdir}/{docbook-xsl,images,javascripts,stylesheets} %files help -%doc %{_mandir}/man1/a2x.1* -%doc %{_mandir}/man1/asciidoc.1* -%{_pkgdocdir}/doc -%{_pkgdocdir}/website -%{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets} -%exclude %{_docdir}/%{name}/{COPYING,COPYRIGHT,README.asciidoc} +%doc %{_mandir}/man1/ +%doc doc %changelog +* Fri Feb 3 2023 dillon chen - 10.1.4-1 +- upgrade to 10.1.4 + * Wed Feb 1 2023 dillon chen - 9.1.1-1 -- Bug fixes. upgrade to 9.1.1 +- upgrade to 9.1.1 * Tue Jun 14 2022 dillon chen - 9.1.0-1 - upgrade to 9.1.0