Drop LDFLAGS patch

Adjust configure calls to ensure that the hardening flags are applied to
the ltmain.sh script and make the LDFLAGS patch unneccesary.

dbus-1.9.20-ldflags.patch

@@ -1,13 +0,0 @@
-I have no idea why autoblah isn't getting this right automatically.
-
-diff -up dbus-1.9.20/dbus/Makefile.am.jx dbus-1.9.20/dbus/Makefile.am
---- dbus-1.9.20/dbus/Makefile.am.jx	2015-07-21 12:46:00.000000000 -0400
-+++ dbus-1.9.20/dbus/Makefile.am	2015-08-14 14:30:32.413052818 -0400
-@@ -297,6 +297,7 @@ libdbus_1_la_LDFLAGS = \
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- 	$(SYMBOL_EXPORT_LDFLAGS) \
- 	-no-undefined \
-+	-Wl,-z,now \
- 	$(NULL)
- 
- libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS) libdbus-1.la

dbus.spec

@@ -18,7 +18,7 @@
 Name:    dbus
 Epoch:   1
 Version: 1.9.20
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: D-BUS message bus
 
 Group:   System Environment/Libraries
@@ -30,8 +30,6 @@ URL:     http://www.freedesktop.org/Software/dbus/
 Source0: http://dbus.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Source1: 00-start-message-bus.sh
 
-Patch0: dbus-1.9.20-ldflags.patch
-
 BuildRequires: libtool
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: libselinux-devel >= %{libselinux_version}
@@ -121,13 +119,18 @@ in this separate package so server systems need not install X.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .ldflags
 
 
 %build
 # Avoid rpath.
 if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf --verbose --force --install; fi
 
+# Call configure here (before the extra directories for the multiple builds
+# have been created) to ensure that the hardening flag hack is applied to
+# ltmain.sh
+%configure %{dbus_common_config_opts} --enable-doxygen-docs --enable-xml-docs --disable-asserts
+make distclean
+
 mkdir build
 pushd build
 # See /usr/lib/rpm/macros
@@ -336,6 +339,9 @@ popd
 
 
 %changelog
+* Thu Aug 20 2015 David King <amigadave@amigadave.com> - 1:1.9.20-3
+- Adjust configure calls to make LDFLAGS patch unneccesary
+
 * Fri Aug 14 2015 Adam Jackson <ajax@redhat.com> 1:1.9.20-2
 - Link libdbus with -z now