[mingw-dbus] Update to 1.4.16 and added win64 support

[epienbro]

commit 55ca3ed7a11a19730a71781fefba9f1871bebf6e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Mar 10 23:06:03 2012 +0100

    Update to 1.4.16 and added win64 support
    
    - Update to 1.4.16
    - Added win64 support
    - Link against libxml2 instead of expat
    - Dropped upstreamed patches

 .gitignore                                         |    1 +
 dbus-1.4.6-path-is-absolute.patch                  |   56 -----------
 ...lict-with-element-type-from-mingw-headers.patch |   14 ---
 mingw-dbus.spec                                    |   97 ++++++++++++++++----
 sources                                            |    2 +-
 5 files changed, 80 insertions(+), 90 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 52d8ac3..a372945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /dbus-1.4.1.tar.gz
 /dbus-1.4.6.tar.gz
+/dbus-1.4.16.tar.gz
diff --git a/mingw-dbus.spec b/mingw-dbus.spec
index f0f783c..f615560 100644
--- a/mingw-dbus.spec
+++ b/mingw-dbus.spec
@@ -1,10 +1,11 @@
-%global __strip %{mingw32_strip}
-%global __objdump %{mingw32_objdump}
-%define __debug_install_post %{mingw32_debug_install_post}
+%?mingw_package_header
+
+%global mingw_build_win32 1
+%global mingw_build_win64 1
 
 Name:           mingw-dbus
-Version:        1.4.6
-Release:        5%{?dist}
+Version:        1.4.16
+Release:        1%{?dist}
 Summary:        MinGW Windows port of D-Bus
 
 License:        GPLv2+ or AFL
@@ -14,24 +15,27 @@ Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 
 BuildArch:      noarch
 
-BuildRequires:  mingw32-filesystem >= 33
+BuildRequires:  mingw32-filesystem >= 95
 BuildRequires:  mingw32-gcc
 BuildRequires:  mingw32-binutils
 BuildRequires:  mingw32-glib2
-BuildRequires:  mingw32-expat
-BuildRequires:  libtool, automake, autoconf
+BuildRequires:  mingw32-libxml2
 
-# Upstream patch: sysdeps-win needs _dbus_path_is_absolute
-Patch0:        dbus-1.4.6-path-is-absolute.patch
+BuildRequires:  mingw64-filesystem >= 95
+BuildRequires:  mingw64-gcc
+BuildRequires:  mingw64-binutils
+BuildRequires:  mingw64-glib2
+BuildRequires:  mingw64-libxml2
+
+BuildRequires:  libtool, automake, autoconf
 
-# One of the files uses ELEMENT_TYPE while this is already used in the mingw-w64 headers
-Patch1:        dbus-prevent-conflict-with-element-type-from-mingw-headers.patch
 
 %description
 D-BUS is a system for sending messages between applications. It is
 used both for the system wide message bus service, and as a
 per-user-login-session messaging facility.
 
+# Win32
 %package -n mingw32-dbus
 Summary:        MinGW Windows port of D-Bus
 Requires:       pkgconfig
@@ -53,30 +57,61 @@ per-user-login-session messaging facility.
 
 Static version of MinGW Windows port of DBus library
 
-%{?mingw32_debug_package}
+# Win64
+%package -n mingw64-dbus
+Summary:        MinGW Windows port of D-Bus
+Requires:       pkgconfig
+
+%description -n mingw64-dbus
+D-BUS is a system for sending messages between applications. It is
+used both for the system wide message bus service, and as a
+per-user-login-session messaging facility.
+
+%package -n mingw64-dbus-static
+Summary:        Static version of MinGW Windows port of DBus library
+Requires:       mingw64-dbus = %{version}-%{release}
+Group:          Development/Libraries
+
+%description -n mingw64-dbus-static
+D-BUS is a system for sending messages between applications. It is
+used both for the system wide message bus service, and as a
+per-user-login-session messaging facility.
+
+Static version of MinGW Windows port of DBus library
+
+
+%?mingw_debug_package
+
 
 %prep
 %setup -q -n dbus-%{version}
-%patch0 -p1
-%patch1 -p0
+
 
 %build
-%{mingw32_configure}
-make %{?_smp_mflags}
+%mingw_configure --with-xml=libxml
+%mingw_make %{?_smp_mflags}
+
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
 
 # Remove .la files
-rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.la
+find $RPM_BUILD_ROOT -name "*.la" -delete
 
 # Remove manpages because they duplicate what's in the
 # Fedora native package already.
+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
+
 
+# Win32
 %files -n mingw32-dbus
 %doc COPYING
 %{mingw32_bindir}/dbus-daemon.exe
@@ -93,7 +128,31 @@ rm -r $RPM_BUILD_ROOT%{mingw32_sysconfdir}/rc.d/init.d/messagebus
 %files -n mingw32-dbus-static
 %{mingw32_libdir}/libdbus-1.a
 
+# Win64
+%files -n mingw64-dbus
+%doc COPYING
+%{mingw64_bindir}/dbus-daemon.exe
+%{mingw64_bindir}/dbus-launch.exe
+%{mingw64_bindir}/dbus-monitor.exe
+%{mingw64_bindir}/dbus-send.exe
+%{mingw64_bindir}/libdbus-1-3.dll
+%{mingw64_libdir}/libdbus-1.dll.a
+%{mingw64_libdir}/pkgconfig/dbus-1.pc
+%{mingw64_sysconfdir}/dbus-1/
+%{mingw64_includedir}/dbus-1.0/
+%{mingw64_libdir}/dbus-1.0/
+
+%files -n mingw64-dbus-static
+%{mingw64_libdir}/libdbus-1.a
+
+
 %changelog
+* Sat Mar 10 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.16-1
+- Update to 1.4.16
+- Added win64 support
+- Link against libxml2 instead of expat
+- Dropped upstreamed patches
+
 * Fri Mar 09 2012 Kalev Lember <kalevlember at gmail.com> - 1.4.6-5
 - Remove .la files
 
diff --git a/sources b/sources
index 5328418..80b884d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99b165f727dd8a5c4b7e2c20a8bf5db6  dbus-1.4.6.tar.gz
+44a2a10678e7e50460879c3eb4453a65  dbus-1.4.16.tar.gz