From c61edfe4a98f95707e507c23fdb2fba09dccc759 Mon Sep 17 00:00:00 2001
From: Erik van Pienbroek <epienbro@fedoraproject.org>
Date: Dec 23 2014 13:08:12 +0000
Subject: Update to 1.8.12


---

diff --git a/.gitignore b/.gitignore
index dc0e873..e646363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /dbus-1.6.8.tar.gz
 /dbus-1.6.12.tar.gz
 /dbus-1.6.28.tar.gz
+/dbus-1.8.12.tar.gz
diff --git a/dbus-improve-clock_getres-detection.patch b/dbus-improve-clock_getres-detection.patch
deleted file mode 100644
index 38ddde0..0000000
--- a/dbus-improve-clock_getres-detection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.ac.orig	2014-12-23 13:43:18.629108562 +0100
-+++ configure.ac	2014-12-23 13:55:53.482370730 +0100
-@@ -964,7 +964,17 @@
- LIBS="$LIBS $THREAD_LIBS"
- AC_CHECK_FUNC(pthread_condattr_setclock,have_pthread_condattr_setclock=true,have_pthread_condattr_setclock=false)
- if test x$have_pthread_condattr_setclock = xtrue; then
--    AC_SEARCH_LIBS([clock_getres],[rt],[THREAD_LIBS="$THREAD_LIBS -lrt"])
-+    AC_CHECK_FUNCS(clock_getres, [], [
-+        AC_CHECK_LIB(rt, clock_getres, [
-+            AC_DEFINE(HAVE_CLOCK_GETRES, 1)
-+            THREAD_LIBS="$THREAD_LIBS -lrt"
-+        ], [
-+            AC_CHECK_LIB(pthread, clock_getres, [
-+                AC_DEFINE(HAVE_CLOCK_GETRES, 1)
-+                THREAD_LIBS="$THREAD_LIBS -lpthread"
-+            ])
-+        ])
-+    ])
-     AC_MSG_CHECKING([for CLOCK_MONOTONIC])
-     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <time.h>
- #include <pthread.h>
diff --git a/mingw-dbus.spec b/mingw-dbus.spec
index 0752e11..f1d1dbf 100644
--- a/mingw-dbus.spec
+++ b/mingw-dbus.spec
@@ -1,7 +1,7 @@
 %?mingw_package_header
 
 Name:           mingw-dbus
-Version:        1.6.28
+Version:        1.8.12
 Release:        1%{?dist}
 Summary:        MinGW Windows port of D-Bus
 
@@ -10,9 +10,6 @@ Group:          Development/Libraries
 URL:            http://www.freedesktop.org/wiki/Software/dbus
 Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 
-# The configure script isn't able to properly winpthreads yet
-Patch0:         dbus-improve-clock_getres-detection.patch
-
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -27,8 +24,6 @@ BuildRequires:  mingw64-binutils
 BuildRequires:  mingw64-glib2
 BuildRequires:  mingw64-libxml2
 
-BuildRequires:  libtool, automake, autoconf
-
 
 %description
 D-BUS is a system for sending messages between applications. It is
@@ -85,12 +80,10 @@ Static version of MinGW Windows port of DBus library
 
 %prep
 %setup -q -n dbus-%{version}
-%patch0 -p0
-autoreconf -i --force
 
 
 %build
-%mingw_configure --with-xml=libxml
+%mingw_configure
 %mingw_make %{?_smp_mflags}
 
 
@@ -105,9 +98,6 @@ find $RPM_BUILD_ROOT -name "*.la" -delete
 rm -rf $RPM_BUILD_ROOT%{mingw32_docdir}/dbus
 rm -rf $RPM_BUILD_ROOT%{mingw64_docdir}/dbus
 
-rm -r $RPM_BUILD_ROOT%{mingw32_mandir}/man1
-rm -r $RPM_BUILD_ROOT%{mingw64_mandir}/man1
-
 # The init.d script is unneeded for Win32 environments so it can be dropped
 rm -r $RPM_BUILD_ROOT%{mingw32_sysconfdir}/rc.d/init.d/messagebus
 rm -r $RPM_BUILD_ROOT%{mingw64_sysconfdir}/rc.d/init.d/messagebus
@@ -149,7 +139,10 @@ rm -r $RPM_BUILD_ROOT%{mingw64_sysconfdir}/rc.d/init.d/messagebus
 
 
 %changelog
-* Tue Dec 22 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.6.28-1
+* Tue Dec 23 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.8.12-1
+- Update to 1.8.12
+
+* Tue Dec 23 2014 Erik van Pienbroek <epienbro@fedoraproject.org> - 1.6.28-1
 - Update to 1.6.28
 - Fixes CVE-2014-7824 (RHBZ #1173557)
 - Fixes CVE-2014-3638 CVE-2014-3639 CVE-2014-3636
diff --git a/sources b/sources
index 84c47b4..382f6ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80935a10a64620f1d0bded39735430a6  dbus-1.6.28.tar.gz
+0ca23fc84c09cb3d29b9c27811ff4475  dbus-1.8.12.tar.gz