update code

asciidoc.spec

@@ -1,22 +1,22 @@
+%global git_commit_hash 51d7c1433faf183f3a1d161c175f347fd28bfe09
+
 Name: asciidoc
 Version: 8.6.10
-Release: 1
+Release: 3
-Summary: Python 3 port of Asciidoc Python
+Summary: Python 3 port of Asciidoc Python.
 License: GPLv2
 URL: http://asciidoc.org
-#Source0 is from:
+Source0: https://github.com/%{name}/%{name}-py3/archive/%{git_commit_hash}/%{name}-py3-51d7c143.tar.gz
-#https://github.com/asciidoc/asciidoc-py3/tree/51d7c1433faf183f3a1d161c175f347fd28bfe09
-#git_commit_date: 20190908, git_commit_hash: 51d7c1433faf183f3a1d161c175f347fd28bfe09
-Source0: asciidoc-py3-8.6.10.tar.gz
 
 BuildRequires: python3-devel docbook-style-xsl graphviz libxslt source-highlight
-BuildRequires: texlive-dvisvgm-bin vim-filesystem symlinks automake autoconf ImageMagick
+BuildRequires: texlive-dvisvgm-bin vim-filesystem symlinks automake autoconf
 
 Requires: python3 docbook-style-xsl graphviz libxslt source-highlight vim-filesystem
 Requires: %{name} = %{version}-%{release}
 
-Provides: %{name}-latex %{name}-music
+Obsoletes: %{name}-latex < %{version}-%{release} %{name}-music < %{version}-%{release}
-Obsoletes: %{name}-latex %{name}-music
+Provides: %{name}-latex = %{version}-%{release} %{name}-music = %{version}-%{release}
+
 BuildArch: noarch
 
 %description
@@ -25,11 +25,12 @@ but passes all tests, real world testing is very much welcomed.
 
 %package_help
 Requires: %{name} = %{version}-%{release}
-Provides: %{name}-doc
+
-Obsoletes: %{name}-doc
+Obsoletes: %{name}-doc < %{version}-%{release}
+Provides: %{name}-doc = %{version}-%{release}
 
 %prep
-%autosetup -n %{name}-py3-%{version}
+%autosetup -n %{name}-py3-%{git_commit_hash}
 
 %build
 autoreconf -v
@@ -38,9 +39,9 @@ autoreconf -v
 
 %install
 make install docs DESTDIR=%{buildroot}
-install -d -m 755 %{buildroot}%{_datadir}/asciidoc/
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/
 for d in  docbook-xsl images javascripts stylesheets; do
-    mv -v %{buildroot}%{_sysconfdir}/asciidoc/$d %{buildroot}%{_datadir}/asciidoc/
+    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}/
@@ -51,7 +52,7 @@ 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}/asciidoc/filters/*}/*.py ; do
+for file in %{buildroot}{%{_bindir},%{_sysconfdir}/%{name}/filters/*}/*.py ; do
     touch ${file}{c,o}
 done
 
@@ -70,25 +71,34 @@ cd tests
 %{__python3} testasciidoc.py run
 cd ..
 
+%pre
+
+%preun
+
+%post
+
+%postun
+
 %files
-%doc BUGS.txt CHANGELOG.txt COPYING COPYRIGHT README.asciidoc
+%doc BUGS.txt CHANGELOG.txt README.asciidoc
-%config(noreplace) %{_sysconfdir}/asciidoc/
+%license COPYING COPYRIGHT
-%dir %{_sysconfdir}/asciidoc/filters/latex
+%config(noreplace) %{_sysconfdir}/%{name}/
-%{_sysconfdir}/asciidoc/filters/latex/*.py
+%dir %{_sysconfdir}/%{name}/filters/latex
-%config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
+%{_sysconfdir}/%{name}/filters/latex/*.py
-%dir %{_sysconfdir}/asciidoc/filters/music
+%config(noreplace) %{_sysconfdir}/%{name}/filters/latex/*.conf
-%config(noreplace) %{_sysconfdir}/asciidoc/filters/music/*.conf
+%dir %{_sysconfdir}/%{name}/filters/music
-%{_sysconfdir}/asciidoc/filters/music/*.py
+%config(noreplace) %{_sysconfdir}/%{name}/filters/music/*.conf
+%{_sysconfdir}/%{name}/filters/music/*.py
 %{_datadir}/vim/vimfiles/syntax/asciidoc.vim
 %{_bindir}/a2x
 %{_bindir}/a2x.py
-%{_bindir}/asciidoc
+%{_bindir}/%{name}
 %{_bindir}/asciidoc.py
-%{_datadir}/asciidoc/
+%{_datadir}/%{name}/
 %{python3_sitelib}/asciidocapi.py*
 %{python3_sitelib}/__pycache__/asciidocapi*
 %exclude %{_bindir}/*.py[co]
-%exclude %{_sysconfdir}/asciidoc/filters/*/*.py[co]
+%exclude %{_sysconfdir}/%{name}/filters/*/*.py[co]
 %exclude %{_pkgdocdir}/examples
 %exclude %{_pkgdocdir}/doc
 %exclude %{_pkgdocdir}/{docbook-xsl,images,javascripts,stylesheets}
@@ -102,5 +112,14 @@ cd ..
 %exclude %{_docdir}/%{name}/{COPYING,COPYRIGHT,README.asciidoc}
 
 %changelog
+* Mon Oct 28 2019 caomeng <caomeng5@huawei.com> - 8.6.10-3
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:remove build requirement ImageMagick
+
+* Mon Oct 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 8.6.10-2
+- Package rebuild.
+
 * Mon Sep 09 2019 openEuler Buildteam <buildteam@openeuler.org> - 8.6.10-1
-- Package init
+- Package init.