From 3a70fb5475555800265305f4685e4a198c79fa2b Mon Sep 17 00:00:00 2001
From: "John (J5) Palmieri" <johnp@fedoraproject.org>
Date: Wed, 16 Jan 2008 17:14:16 +0000
Subject: [PATCH] - new upstream version which obsoletes a number of our
 patches - doc section added for the devhelp docs

---
 .cvsignore |  1 +
 dbus.spec  | 36 +++++++++++++++++++++---------------
 sources    |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3386ba4..3732fd4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 dbus-1.1.2.tar.gz
+dbus-1.1.3.tar.gz
diff --git a/dbus.spec b/dbus.spec
index 118cff3..9e9d6ba 100644
--- a/dbus.spec
+++ b/dbus.spec
@@ -7,8 +7,8 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 1.1.2
-Release: 9%{?dist}
+Version: 1.1.3
+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
@@ -38,14 +38,6 @@ Conflicts: cups < 1:1.1.20-4
 
 Patch0: dbus-0.60-start-early.patch
 Patch1: dbus-1.0.1-generate-xml-docs.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=11491
-Patch2: dbus-1.0.2-lsb.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=12429
-Patch3: dbus-1.1.2-audit-user.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=12430
-Patch4: dbus-1.1.2-no-abort.patch
-# from upstream git
-Patch5: dbus-pie.patch
 
 %description
 
@@ -62,6 +54,16 @@ Obsoletes: dbus < 1.1.2-3
 %description libs
 Lowlevel libraries for accessing D-BUS
 
+%package doc
+Summary: Developer documentation for D-BUS
+Group: Documentation
+Requires: %name = %{version}-%{release}
+Requires: devhelp
+
+%description doc 
+This package contains DevHelp developer documentation for D-Bus along with
+other supporting documentation such as the introspect dtd file
+
 %package devel
 Summary: Libraries and headers for D-BUS
 Group: Development/Libraries
@@ -91,10 +93,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 .lsb
-%patch3 -p1 -b .audit-user
-%patch4 -p1 -b .abort
-%patch5 -p1 -b .pie
 
 autoreconf -f -i
 
@@ -204,6 +202,11 @@ fi
 %{_bindir}/dbus-launch
 %{_datadir}/man/man*/dbus-launch.1.gz
 
+%files doc
+%defattr(-,root,root)
+%doc doc/introspect.dtd doc/introspect.xsl doc/system-activation.txt
+%{_datadir}/devhelp/books/dbus
+
 %files devel
 %defattr(-,root,root)
 
@@ -212,9 +215,12 @@ fi
 %{_libdir}/dbus-1.0/include/
 %{_libdir}/pkgconfig/dbus-1.pc
 %{_includedir}/*
-%{_datadir}/devhelp/books/dbus
 
 %changelog
+* Thu Jan 16 2008 John (J5) Palmieri <johnp@redhat.com> - 1.1.3-1
+- new upstream version which obsoletes a number of our patches
+- doc section added for the devhelp docs
+
 * Thu Nov 15 2007 John (J5) Palmieri <johnp@redhat.com> - 1.1.2-9
 - clean up spec file as per the merge review (#225676)
 
diff --git a/sources b/sources
index 16661df..93a0c1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e33d96a4c4605536127835a70b14d5b9  dbus-1.1.2.tar.gz
+2e0185e1f8b4c61c9248049c680d2ab6  dbus-1.1.3.tar.gz