Accepting request 802865 from home:dirkmueller:branches:shells

- fix extra tokens at the end of %endif directive build errors

OBS-URL: https://build.opensuse.org/request/show/802865
OBS-URL: https://build.opensuse.org/package/show/shells/bash-completion?expand=0&rev=113
This commit is contained in:
Dr. Werner Fink 2020-05-12 09:16:31 +00:00 committed by Git OBS Bridge
parent 6c7553cee8
commit 5986a4e9c9
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 12 08:20:39 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- fix extra tokens at the end of %endif directive build errors
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 13 09:54:50 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de> Mon Apr 13 09:54:50 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>

View File

@ -59,7 +59,7 @@ Patch13: bash-completion-fix-missing-directory-completion-with-filename-p
%if %build_doc %if %build_doc
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: libxslt-tools BuildRequires: libxslt-tools
%endif %build_doc %endif
BuildRequires: pkg-config BuildRequires: pkg-config
%if %build_core %if %build_core
BuildRequires: cmake BuildRequires: cmake
@ -95,7 +95,7 @@ BuildArch: noarch
This package contains the package documentation file of the This package contains the package documentation file of the
package bash-completion. package bash-completion.
%endif %build_doc %endif
%prep %prep
%setup -q %setup -q
%patch0 -b .p0 %patch0 -b .p0
@ -116,13 +116,13 @@ package bash-completion.
%configure %configure
%if %build_core %if %build_core
make %{?_smp_mflags} make %{?_smp_mflags}
%endif %build_core %endif
%if %build_doc %if %build_doc
pushd doc pushd doc
mkdir html mkdir html
a2x -D html -d book -f xhtml --asciidoc-opts="--unsafe" main.txt a2x -D html -d book -f xhtml --asciidoc-opts="--unsafe" main.txt
popd popd
%endif %build_doc %endif
%install %install
%if %build_core %if %build_core
@ -155,7 +155,7 @@ fi
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/bts rm -vf %{buildroot}%{_datadir}/bash-completion/completions/bts
# Seems to be broken (boo#1161136) # Seems to be broken (boo#1161136)
rm -vf %{buildroot}%{_datadir}/bash-completion/completions/_adb rm -vf %{buildroot}%{_datadir}/bash-completion/completions/_adb
%endif %build_core %endif
%if %build_doc %if %build_doc
pushd doc pushd doc
mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/html mkdir -p %{buildroot}%{_defaultdocdir}/%{name}/html
@ -163,7 +163,7 @@ pushd doc
popd popd
install -m 0644 AUTHORS %{buildroot}%{_defaultdocdir}/%{name}/ install -m 0644 AUTHORS %{buildroot}%{_defaultdocdir}/%{name}/
install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README
%endif %build_doc %endif
%if %build_core %if %build_core
%files %files
@ -173,7 +173,7 @@ install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README
%exclude %{_defaultdocdir}/%{name}/AUTHORS %exclude %{_defaultdocdir}/%{name}/AUTHORS
%exclude %{_defaultdocdir}/%{name}/README %exclude %{_defaultdocdir}/%{name}/README
%exclude %{_defaultdocdir}/%{name}/html/ %exclude %{_defaultdocdir}/%{name}/html/
%endif %build_doc %endif
%{_datadir}/bash-completion %{_datadir}/bash-completion
%{_datadir}/cmake/bash-completion %{_datadir}/cmake/bash-completion
%config %{_sysconfdir}/profile.d/bash_completion.sh %config %{_sysconfdir}/profile.d/bash_completion.sh
@ -186,7 +186,7 @@ install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README
# Own this directory to prevent it. # Own this directory to prevent it.
%dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion
%endif %build_core %endif
%if %build_doc %if %build_doc
%files doc %files doc
%defattr(-,root,root) %defattr(-,root,root)
@ -195,6 +195,6 @@ install -m 0644 README.md %{buildroot}%{_defaultdocdir}/%{name}/README
%{_defaultdocdir}/%{name}/README %{_defaultdocdir}/%{name}/README
%{_defaultdocdir}/%{name}/html/ %{_defaultdocdir}/%{name}/html/
%endif %build_doc %endif
%changelog %changelog