From 249d82077b0869cc3dd1752925269b82da96c632 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@fedoraproject.org>
Date: Jul 16 2009 19:30:24 +0000
Subject: - Upstream 1.2.16

- Remove inotify patch, now upstreamed
- Remove timeout patch, obsolete with upstream change to infinite timeout
    maximum by default

---

diff --git a/.cvsignore b/.cvsignore
index 033173e..03fe990 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dbus-1.2.14.tar.gz
+dbus-1.2.16.tar.gz
diff --git a/dbus.spec b/dbus.spec
index 2dcd452..fbf0755 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -8,8 +8,8 @@
 Summary: D-BUS message bus
 Name: dbus
 Epoch: 1
-Version: 1.2.14
-Release: 2%{?dist}
+Version: 1.2.16
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -40,9 +40,6 @@ Conflicts: cups < 1:1.1.20-4
 
 Patch0: start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
-Patch6: dbus-1.2.1-increase-timeout.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=22516
-Patch7: dbus-inotify-fd-leak.patch
 
 %description
 D-BUS is a system for sending messages between applications. It is
@@ -97,8 +94,6 @@ in this separate package so server systems need not install X.
 
 %patch0 -p1 -b .start-early
 %patch1 -p1 -b .generate-xml-docs
-%patch6 -p1 -b .increase-timeout
-%patch7 -p1 -b .inotify-fd-leak
 
 autoreconf -f -i
 
@@ -230,6 +225,12 @@ fi
 %{_includedir}/*
 
 %changelog
+* Tue Jul 14 2009 Colin Walters <walters@redhat.com> - 1:1.2.16-1
+- Upstream 1.2.16
+- Remove inotify patch, now upstreamed
+- Remove timeout patch, obsolete with upstream change to infinite
+  timeout maximum by default
+
 * Sat Jun 27 2009 Matthias Clasen <mclasen@redhat.com> - 1:1.2.14-2
 - Don't leak inotify fd (#505338)
 
diff --git a/sources b/sources
index 5126ba8..09684ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c267ccd45d0b18db8c9edacad63ec98  dbus-1.2.14.tar.gz
+9cdae6a52442b62ffa4861757b1635b0  dbus-1.2.16.tar.gz