SOURCES (AC-branch): dbus-gcj.patch (NEW), dbus-nolibs.patch, dbus...

[baggins]

Author: baggins                      Date: Sun May 14 22:49:02 2006 GMT
Module: SOURCES                       Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SOURCES:
   dbus-gcj.patch (NONE -> 1.2.4.1)  (NEW), dbus-nolibs.patch (1.1 -> 1.1.4.1) , dbus-sysconfig (1.2 -> 1.2.2.1) , messagebus.init (1.3.2.1 -> 1.3.2.2) 

---- Diffs:

================================================================
Index: SOURCES/dbus-gcj.patch
diff -u /dev/null SOURCES/dbus-gcj.patch:1.2.4.1
--- /dev/null	Mon May 15 00:49:02 2006
+++ SOURCES/dbus-gcj.patch	Mon May 15 00:48:57 2006
@@ -0,0 +1,23 @@
+diff -aurN dbus-0.61.orig/gcj/Makefile.am dbus-0.61/gcj/Makefile.am
+--- dbus-0.61.orig/gcj/Makefile.am	2006-02-10 21:57:10.000000000 +0100
++++ dbus-0.61/gcj/Makefile.am	2006-02-25 10:01:42.770512976 +0100
+@@ -13,6 +13,7 @@
+ 
+ noinst_PROGRAMS = test-message
+ 
++AM_GCJFLAGS=-I.
+ test_message_SOURCES = TestMessage.java
+ test_message_LDFLAGS = --main=TestMessage
+ test_message_LDADD = $(top_builddir)/gcj/org/freedesktop/dbus/libdbus-gcj-1.la
+diff -aurN dbus-0.61.orig/gcj/org/freedesktop/dbus/Makefile.am dbus-0.61/gcj/org/freedesktop/dbus/Makefile.am
+--- dbus-0.61.orig/gcj/org/freedesktop/dbus/Makefile.am	2005-09-07 00:38:54.000000000 +0200
++++ dbus-0.61/gcj/org/freedesktop/dbus/Makefile.am	2006-02-25 10:00:45.082282920 +0100
+@@ -23,7 +23,7 @@
+ java_object_files = $(java_sources:.java=.lo)
+ 
+ .class.h:
+-	$(GCJH) $(basename $<)
++	$(GCJH) -I. $(basename $<)
+ 
+ .java.class:
+ 	$(GCJ) -C $< -d ../../..

================================================================
Index: SOURCES/dbus-nolibs.patch
diff -u SOURCES/dbus-nolibs.patch:1.1 SOURCES/dbus-nolibs.patch:1.1.4.1
--- SOURCES/dbus-nolibs.patch:1.1	Thu Aug 28 11:27:29 2003
+++ SOURCES/dbus-nolibs.patch	Mon May 15 00:48:57 2006
@@ -11,3 +11,12 @@
  
  AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist)
  
+@@ -1083,7 +1083,7 @@
+ 
+ if test x$enable_x11 = xyes ; then
+    AC_DEFINE(DBUS_BUILD_X11,1,[Build X11-dependent code])
+-   DBUS_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++   DBUS_X_LIBS="$X_LIBS -lX11 $X_EXTRA_LIBS"
+    DBUS_X_CFLAGS="$X_CFLAGS"
+ else
+    DBUS_X_LIBS=

================================================================
Index: SOURCES/dbus-sysconfig
diff -u SOURCES/dbus-sysconfig:1.2 SOURCES/dbus-sysconfig:1.2.2.1
--- SOURCES/dbus-sysconfig:1.2	Wed Nov 23 14:30:32 2005
+++ SOURCES/dbus-sysconfig	Mon May 15 00:48:57 2006
@@ -5,3 +5,7 @@
 # Start D-BUS session daemon while start X session
 # This option need installed package dbus-X11
 SESSION_BUS_X_SESSION="yes"
+
+# Don't restart messagebus service on package
+# upgrade - kills all running dbus services
+RPM_SKIP_AUTO_RESTART=yes

================================================================
Index: SOURCES/messagebus.init
diff -u SOURCES/messagebus.init:1.3.2.1 SOURCES/messagebus.init:1.3.2.2
--- SOURCES/messagebus.init:1.3.2.1	Tue Jan 31 15:03:25 2006
+++ SOURCES/messagebus.init	Mon May 15 00:48:57 2006
@@ -2,7 +2,7 @@
 #
 # messagebus	The D-BUS systemwide message bus
 #
-# chkconfig:	345 97 03
+# chkconfig:	345 22 85
 #
 # description:	This is a daemon which broadcasts notifications of system
 #		events and other messages.
@@ -18,7 +18,6 @@
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
 	if [ ! -f /var/lock/subsys/network ]; then
-		# nls "ERROR: Networking is down. %s can't be run." messagebus
 		msg_network_down messagebus
 		exit 1
 	fi
@@ -32,26 +31,22 @@
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/messagebus ]; then
-		# show "Starting %s service" messagebus
 		msg_starting messagebus
 		daemon dbus-daemon --system
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/messagebus
 	else
-		# show "%s service is already running." messagebus
 		msg_already_running messagebus
 	fi
 	;;
   stop)
 	if [ -f /var/lock/subsys/messagebus ]; then
 		# Stop daemons.
-		# show "Stopping %s service" messagebus
 		msg_stopping messagebus
 		killproc --pidfile dbus.pid dbus-daemon
 		rm -f /var/lock/subsys/messagebus
 		rm -f /var/run/dbus.pid
 	else
-		# show "%s service is not running." messagebus
 		msg_not_running messagebus
 	fi
 	;;
@@ -62,12 +57,10 @@
 	;;
   reload)
 	if [ -f /var/lock/subsys/messagebus ]; then
-		# show "Reload %s service" messagebus
 		msg_reloading messagebus
 		killproc dbus-daemon -HUP
 		RETVAL=$?
 	else
-		# show "%s service is not running." messagebus
 		msg_not_running messagebus >&2
 		RETVAL=7
 	fi
@@ -86,7 +79,6 @@
 	RETVAL=$?
 	;;
   *)
-	# show "Usage: %s {start|stop|restart|reload|force-reload|status}"
 	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
 	exit 3
 esac
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/dbus-nolibs.patch?r1=1.1&r2=1.1.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/dbus-sysconfig?r1=1.2&r2=1.2.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/messagebus.init?r1=1.3.2.1&r2=1.3.2.2&f=u