From 0720e1cc1b576ef59ca529414aeba02f874ef581 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@fedoraproject.org>
Date: Feb 28 2008 04:45:34 +0000
Subject: - Update to latest upstream release. Includes fix for CVE-2008-0595

- Drop some patches that went upstream already

---

diff --git a/.cvsignore b/.cvsignore
index cb0112a..ffa4bb5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 dbus-1.1.2.tar.gz
 dbus-1.1.3.tar.gz
 dbus-1.1.4.tar.gz
+dbus-1.1.20.tar.gz
diff --git a/dbus.spec b/dbus.spec
index d7f1237..44f9a20 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -7,8 +7,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 1.1.4
-Release: 6%{?dist}
+Version: 1.1.20
+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
@@ -39,8 +39,6 @@ Conflicts: cups < 1:1.1.20-4
 
 Patch0: dbus-0.60-start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
-Patch2: ucred-and-limits.patch
-Patch3: babysitter-x.patch
 
 %description
 
@@ -96,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
-%patch2 -p1 -b .ucred-and-limits
-%patch3 -p1 -b .babysitter-x
 
 autoreconf -f -i
 
@@ -225,6 +221,10 @@ fi
 %{_includedir}/*
 
 %changelog
+* Wed Feb 27 2008 David Zeuthen <davidz@redhat.com> - 1.1.20-1%{?dist}
+- Update to latest upstream release. Includes fix for CVE-2008-0595.
+- Drop some patches that went upstream already
+
 * Wed Feb 20 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.1.4-6
 - Really rebuild against new libcap
 
diff --git a/sources b/sources
index b29863e..1612959 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e08fdf702cae648acd9780eca0ce4df6  dbus-1.1.4.tar.gz
+c552b9bc4b69e4c602644abc21b7661e  dbus-1.1.20.tar.gz