From 44afd46a7682625578caf6150126d751c807d67d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Thu, 28 Jun 2007 15:07:52 +0000
Subject: [PATCH] - Update to 1.1.1

---
 .cvsignore |  2 +-
 dbus.spec  | 28 +++++++++-------------------
 sources    |  2 +-
 3 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 8e21182..cbe2978 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dbus-1.0.2.tar.gz
+dbus-1.1.1.tar.gz
diff --git a/dbus.spec b/dbus.spec
index 35789ff..f0be15b 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -7,8 +7,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 1.0.2 
-Release: 6%{?dist}
+Version: 1.1.1 
+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
@@ -32,11 +32,8 @@ Requires: libselinux >= %{libselinux_version}
 
 Conflicts: cups < 1:1.1.20-4
 
-Patch0: dbus-0.61-selinux-avc-audit.patch
-Patch1: dbus-0.60-start-early.patch
-Patch2: dbus-0.92-audit-system.patch
-Patch4: dbus-1.0.1-generate-xml-docs.patch
-Patch5: dbus-1.0.2-selinux.patch
+Patch0: dbus-0.60-start-early.patch
+Patch1: dbus-1.0.1-generate-xml-docs.patch
 
 %description
 
@@ -68,24 +65,14 @@ in this separate package so server systems need not install X.
 %prep
 %setup -q
 
-%patch0 -p1 -b .selinux-avc-audit
-%patch1 -p1 -b .start-early
-%patch2 -p1 -b .audit_system
-%patch4 -p1 -b .generate-xml-docs
-%patch5 -p1 -b .selinux-send-to-audit
+%patch0 -p1 -b .start-early
+%patch1 -p1 -b .generate-xml-docs
 
 autoreconf -f -i
 
 %build
 COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
 
-#### Build once with tests to make check
-%configure $COMMON_ARGS --enable-tests=yes --enable-verbose-mode=yes --enable-asserts=yes
-DBUS_VERBOSE=1 make
-
-#### Clean up and build again 
-make clean 
-
 # leave verbose mode so people can debug their apps but make sure to
 # turn it off on stable releases with --disable-verbose-mode
 %configure $COMMON_ARGS --disable-tests --disable-asserts --enable-doxygen-docs --enable-xml-docs
@@ -189,6 +176,9 @@ fi
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Thu Jun 28 2007 Ray Strode <rstrode@redhat.com> - 1.1.1-1
+- Update to 1.1.1
+
 * Fri Jun 22 2007 Matthias Clasen <mclasen@redhat.com> - 1.0.2-6
 - Don't require libxml-python needlessly (#245300)
 
diff --git a/sources b/sources
index 6baa418..4a37580 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0552a9b54beb4a044951b7cdbc8fc855  dbus-1.0.2.tar.gz
+545ce6d92cb1ed63a54b39d15aed36a6  dbus-1.1.1.tar.gz