Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/asciidoc.git#aa5b8a8f29dba47efec45eb12d10528a36c24815

asciidoc.spec

@@ -1,6 +1,6 @@
 Name:           asciidoc
 Version:        9.0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Text based document generation
 
 License:        GPL+ and GPLv2+
@@ -17,7 +17,6 @@ BuildRequires:  dblatex
 BuildRequires:  docbook-style-xsl
 BuildRequires:  graphviz
 BuildRequires:  libxslt
-BuildRequires:  lilypond
 BuildRequires:  source-highlight
 BuildRequires:  texlive-dvipng-bin
 BuildRequires:  texlive-dvisvgm-bin
@@ -55,24 +54,22 @@ Requires: texlive-dvipng-bin
 %description latex
 %{summary}.
 
-%package music
-Summary:  Support for asciidoc music output
-
-Requires: %{name} = %{version}-%{release}
-Requires: lilypond
-
-%description music
-%{summary}.
-
 %prep
 %autosetup -n %{name}-py3-%{version} -p1
 # Convert files to utf-8
-for file in doc/*.dict website/*.dict; do
+for file in README.asciidoc doc/*.dict website/*.dict; do
     iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
     touch -r $file $file.new && \
     mv $file.new $file
 done
 
+# Remove music files
+rm -rf %{buildroot}{%{_sysconfdir}/asciidoc/filters/music,%{_sysconfdir}/asciidoc/filters/music/*.conf,%{_sysconfdir}/asciidoc/filters/music/*.py}
+
+# Fix python shebang
+grep -rl '#!/usr/bin/env python' | xargs -r \
+    sed -i -e '1s@#!/usr/bin/env python3\?$@#!%{__python3}@'
+
 %build
 autoreconf -v
 %configure
@@ -152,12 +149,10 @@ rm -f %{buildroot}/%{_mandir}/man1/testasciidoc.1*
 %{_sysconfdir}/asciidoc/filters/latex/*.py
 %config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
 
-%files music
-%dir %{_sysconfdir}/asciidoc/filters/music
-%config(noreplace) %{_sysconfdir}/asciidoc/filters/music/*.conf
-%{_sysconfdir}/asciidoc/filters/music/*.py
-
 %changelog
+* Mon Jan 18 2021 Josef Ridky <jridky@redhat.com> - 9.0.4-4
+- remove asciidoc-music sub-package (lilypond requirement)
+
 * Thu Jan 14 2021 Josef Ridky <jridky@redhat.com> - 9.0.4-3
 - remove ImageMagic requirement