Accepting request 816779 from shells

- Modify qdbus-qt5.patch: only modify Makefile.am; Makefile.in is
  auto-generated based on the .am file.
- Add libtool BuildRequires and explicitly call autoreconf: unless
  we do this, there is a chance that the build modifies the above
  mentioned .am and .in files with different timestamps, which in
  turn triggers an implicit autoreconf. Without libtool present
  though, this will fail. (forwarded request 816725 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/816779
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bash-completion?expand=0&rev=49

bash-completion.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jun 23 13:01:29 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Modify qdbus-qt5.patch: only modify Makefile.am; Makefile.in is
+  auto-generated based on the .am file.
+- Add libtool BuildRequires and explicitly call autoreconf: unless
+  we do this, there is a chance that the build modifies the above
+  mentioned .am and .in files with different timestamps, which in
+  turn triggers an implicit autoreconf. Without libtool present
+  though, this will fail.
+
 -------------------------------------------------------------------
 Tue May 12 08:20:39 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

bash-completion.spec

@@ -60,6 +60,7 @@ Patch13:        bash-completion-fix-missing-directory-completion-with-filename-p
 BuildRequires:  asciidoc
 BuildRequires:  libxslt-tools
 %endif
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 %if %build_core
 BuildRequires:  cmake
@@ -113,6 +114,7 @@ package bash-completion.
 %patch13 -b .p13 -p1
 
 %build
+autoreconf -fiv
 %configure
 %if %build_core
 make %{?_smp_mflags}

qdbus-qt5.patch

@@ -15,27 +15,6 @@ Index: bash-completion-2.10/completions/qdbus
 +complete -F _qdbus qdbus qdbus-qt5 dcop
  
  # ex: filetype=sh
-Index: bash-completion-2.10/completions/Makefile.in
-===================================================================
---- bash-completion-2.10.orig/completions/Makefile.in
-+++ bash-completion-2.10/completions/Makefile.in
-@@ -892,6 +892,7 @@ CLEANFILES = \
- 	pyvenv-3.6 \
- 	pyvenv-3.7 \
- 	pyvenv-3.8 \
-+	qdbus-qt5 \
- 	qemu-kvm \
- 	qemu-system-i386 \
- 	qemu-system-x86_64 \
-@@ -1324,7 +1325,7 @@ symlinks: $(DATA)
- 	$(ss) pyvenv \
- 		pyvenv-3.4 pyvenv-3.5 pyvenv-3.6 pyvenv-3.7 pyvenv-3.8
- 	$(ss) qdbus \
--		dcop
-+		dcop qdbus-qt5
- 	$(ss) qemu \
- 		qemu-kvm qemu-system-i386 qemu-system-x86_64
- 	$(ss) quota \
 Index: bash-completion-2.10/completions/Makefile.am
 ===================================================================
 --- bash-completion-2.10.orig/completions/Makefile.am