[mingw-dbus: 4/12] New upstream version

[epienbro]

commit b98e91cb3d5132a9ab26003e0e18775eebc901ad
Author: Ivan Romanov <drizt at land.ru>
Date:   Mon Mar 28 03:29:28 2011 +0600

    New upstream version

 dbus-1.4.6-path-is-absolute.patch |   56 +++++++++++++++++++++++++++++++++++++
 mingw32-dbus.spec                 |   26 ++++++++--------
 sources                           |    2 +-
 3 files changed, 70 insertions(+), 14 deletions(-)
---
diff --git a/dbus-1.4.6-path-is-absolute.patch b/dbus-1.4.6-path-is-absolute.patch
new file mode 100644
index 0000000..895124f
--- /dev/null
+++ b/dbus-1.4.6-path-is-absolute.patch
@@ -0,0 +1,56 @@
+diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
+index f10100b..9b3421e 100644
+--- a/dbus/dbus-sysdeps-util-win.c
++++ b/dbus/dbus-sysdeps-util-win.c
+@@ -682,23 +682,6 @@ _dbus_directory_close (DBusDirIter *iter)
+   dbus_free (iter);
+ }
+ 
+-/**
+- * Checks whether the filename is an absolute path
+- *
+- * @param filename the filename
+- * @returns #TRUE if an absolute path
+- */
+-dbus_bool_t
+-_dbus_path_is_absolute (const DBusString *filename)
+-{
+-  if (_dbus_string_get_length (filename) > 0)
+-    return _dbus_string_get_byte (filename, 1) == ':'
+-           || _dbus_string_get_byte (filename, 0) == '\\'
+-           || _dbus_string_get_byte (filename, 0) == '/';
+-  else
+-    return FALSE;
+-}
+-
+ /** @} */ /* End of DBusInternalsUtils functions */
+ 
+ /**
+diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
+index b70ac6a..19f6fa0 100644
+--- a/dbus/dbus-sysdeps-win.c
++++ b/dbus/dbus-sysdeps-win.c
+@@ -3557,6 +3557,23 @@ _dbus_delete_directory (const DBusString *filename,
+   return TRUE;
+ }
+ 
++/**
++ * Checks whether the filename is an absolute path
++ *
++ * @param filename the filename
++ * @returns #TRUE if an absolute path
++ */
++dbus_bool_t
++_dbus_path_is_absolute (const DBusString *filename)
++{
++  if (_dbus_string_get_length (filename) > 0)
++    return _dbus_string_get_byte (filename, 1) == ':'
++           || _dbus_string_get_byte (filename, 0) == '\\'
++           || _dbus_string_get_byte (filename, 0) == '/';
++  else
++    return FALSE;
++}
++
+ /** @} end of sysdeps-win */
+ /* tests in dbus-sysdeps-util.c */
+ 
diff --git a/mingw32-dbus.spec b/mingw32-dbus.spec
index 7682ce5..7743d16 100644
--- a/mingw32-dbus.spec
+++ b/mingw32-dbus.spec
@@ -6,19 +6,15 @@
 %define __debug_install_post %{_mingw32_debug_install_post}
 
 Name:           mingw32-dbus
-Version:        1.4.1
-Release:        0.2.20101008git%{?dist}
-Summary:        MinGW Windows port of DBus
+Version:        1.4.6
+Release:        1%{?dist}
+Summary:        MinGW Windows port of D-Bus
 
 License:        GPLv2+ or AFL
 Group:          Development/Libraries
 URL:            http://www.freedesktop.org/wiki/Software/dbus
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-# D-Bus windows port version 1.4.0 (i.e. stable) 
-# has contains several open issues
-# I used the latest snapshot from stable git branch
-Source0:        dbus-%{version}.tar.gz
+Source0:        http://dbus.freedesktop.org/releases/dbus/dbus-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -31,6 +27,9 @@ BuildRequires:  libtool, automake, autoconf
 
 Requires:       pkgconfig
 
+# Upstream patch: sysdeps-win needs _dbus_path_is_absolute
+Patch0:        dbus-1.4.6-path-is-absolute.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
@@ -52,13 +51,13 @@ Static version of MinGW Windows port of DBus library
 
 %prep
 %setup -q -n dbus-%{version}
+%patch0 -p1
 
 %build
 %{_mingw32_configure}
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # Remove manpages because they duplicate what's in the
@@ -68,10 +67,6 @@ rm -r $RPM_BUILD_ROOT%{_mingw32_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
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING
@@ -92,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mingw32_libdir}/libdbus-1.a
 
 %changelog
+* Mon Mar 28 2011 Ivan Romanov <drizt at land.ru> - 1.4.6-1
+- New upstream version
+- Removed clean stage
+- Added dbus-1.4.6-path-is-absolute.patch patch
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-0.2.20101008git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d2e497d..5328418 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d77431917611e3167105181954bb595  dbus-1.4.1.tar.gz
+99b165f727dd8a5c4b7e2c20a8bf5db6  dbus-1.4.6.tar.gz