From 3d67701b504eb2f1b46a5c23f740c5107eb5662249e9e4099f1d897609210c4a Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Wed, 24 Jun 2020 06:07:38 +0000
Subject: [PATCH] Accepting request 816725 from home:dimstar:Factory

- 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.

OBS-URL: https://build.opensuse.org/request/show/816725
OBS-URL: https://build.opensuse.org/package/show/shells/bash-completion?expand=0&rev=116
---
 bash-completion.changes | 11 +++++++++++
 bash-completion.spec    |  2 ++
 qdbus-qt5.patch         | 21 ---------------------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/bash-completion.changes b/bash-completion.changes
index ac065ca..38aefa6 100644
--- a/bash-completion.changes
+++ b/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>
 
diff --git a/bash-completion.spec b/bash-completion.spec
index f03b3e6..f17bcca 100644
--- a/bash-completion.spec
+++ b/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}
diff --git a/qdbus-qt5.patch b/qdbus-qt5.patch
index cdda3e2..33526bf 100644
--- a/qdbus-qt5.patch
+++ b/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