rpms/dbus/OLPC-2 dbus-1.0.0-no_fatal_checks.patch, NONE, 1.1 .cvsignore, 1.26, 1.27 dbus.spec, 1.118, 1.119 sources, 1.27, 1.28

[John (J5) Palmieri (johnp)]

Author: johnp

Update of /cvs/extras/rpms/dbus/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427

Modified Files:
	.cvsignore dbus.spec sources 
Added Files:
	dbus-1.0.0-no_fatal_checks.patch 
Log Message:
- Build 1.1.0 for olpc2


dbus-1.0.0-no_fatal_checks.patch:

--- NEW FILE dbus-1.0.0-no_fatal_checks.patch ---
--- dbus-1.0.0/dbus/dbus-internals.c.no_fatal_checks	2006-11-13 14:32:47.000000000 -0500
+++ dbus-1.0.0/dbus/dbus-internals.c	2006-11-13 14:32:55.000000000 -0500
@@ -192,7 +192,7 @@
 
 static dbus_bool_t warn_initted = FALSE;
 static dbus_bool_t fatal_warnings = FALSE;
-static dbus_bool_t fatal_warnings_on_check_failed = TRUE;
+static dbus_bool_t fatal_warnings_on_check_failed = FALSE;
 
 static void
 init_warnings(void)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dbus/OLPC-2/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore	26 Mar 2007 03:33:05 -0000	1.26
+++ .cvsignore	15 Jun 2007 03:13:42 -0000	1.27
@@ -1 +1,2 @@
 dbus-1.0.2.tar.gz
+dbus-1.1.0.tar.gz


Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/OLPC-2/dbus.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- dbus.spec	13 Apr 2007 23:29:58 -0000	1.118
+++ dbus.spec	15 Jun 2007 03:13:42 -0000	1.119
@@ -7,11 +7,10 @@
 
 Summary: D-BUS message bus
 Name: dbus
-Version: 1.0.2 
-Release: 4%{?dist}
+Version: 1.1.0 
+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
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
@@ -36,8 +35,7 @@
 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
+Patch3: dbus-1.0.0-no_fatal_checks.patch
 
 %description
 
@@ -72,8 +70,7 @@
 %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
+%patch3 -p1 -b .no_fatal_checks
 
 autoreconf -f -i
 
@@ -89,13 +86,9 @@
 
 # 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
+%configure $COMMON_ARGS --disable-tests --disable-asserts --disable-verbose-mode
 make
 
-doxygen Doxyfile
-
-xsltproc -o dbus.devhelp %{SOURCE1} doc/api/xml/index.xml
-
 %install
 rm -rf %{buildroot}
 
@@ -115,15 +108,6 @@
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.a
 rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus/api
-
-cp dbus.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus
-cp doc/dbus-specification.html $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus
-cp doc/dbus-faq.html $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus
-cp doc/dbus-tutorial.html $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus
-cp doc/api/html/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/dbus/api
-
 ## %find_lang %{gettext_package}
 
 %clean
@@ -187,9 +171,11 @@
 %{_libdir}/dbus-1.0/include/
 %{_libdir}/pkgconfig/dbus-1.pc
 %{_includedir}/*
-%{_datadir}/devhelp/books/dbus
 
 %changelog
+* Thu Jun 14 2007 John (J5) Palmieri <johnp at redhat.com> - 1.1.0-1
+- Build 1.1.0 for olpc2
+
 * Sat Apr 14 2007 Matthias Clasen <mclasen at redhat.com> - 1.0.2-4
 - Move the dbus-launch man page to the x11 subpackage
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dbus/OLPC-2/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	26 Mar 2007 03:33:05 -0000	1.27
+++ sources	15 Jun 2007 03:13:42 -0000	1.28
@@ -1 +1 @@
-0552a9b54beb4a044951b7cdbc8fc855  dbus-1.0.2.tar.gz
+33da5c29ba1e83c07efeb8be8edae0ef  dbus-1.1.0.tar.gz