rpms/control-center/devel control-center-2.15.4-add-dbus-flags.patch, NONE, 1.1 control-center.spec, 1.155, 1.156

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26095

Modified Files:
	control-center.spec 
Added Files:
	control-center-2.15.4-add-dbus-flags.patch 
Log Message:
- Add patch to use the dbus cflags and libs instead of relying on hal
  flags to populate them


control-center-2.15.4-add-dbus-flags.patch:
 Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE control-center-2.15.4-add-dbus-flags.patch ---
--- control-center-2.15.4/capplets/sound/Makefile.am.add-dbus-flags	2006-07-19 11:15:47.000000000 -0400
+++ control-center-2.15.4/capplets/sound/Makefile.am	2006-07-19 11:16:18.000000000 -0400
@@ -5,6 +5,8 @@
 	$(GNOMECC_CAPPLETS_LIBS) \
 	$(SOUND_CAPPLET_LIBS) \
 	$(HAL_LIBS)
+	$(DBUS_LIBS)
+
 gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pipeline-tests.c
 
 @INTLTOOL_DESKTOP_RULE@
@@ -19,6 +21,6 @@
 Desktop_in_files = gnome-settings-sound.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS) $(DBUS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA)


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- control-center.spec	19 Jul 2006 00:11:24 -0000	1.155
+++ control-center.spec	19 Jul 2006 15:22:57 -0000	1.156
@@ -21,7 +21,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.15.4
-Release: 3 
+Release: 4 
 Epoch: 1
 License: GPL/LGPL
 Group: User Interface/Desktops
@@ -35,6 +35,7 @@
 Patch6: control-center-2.12.1-passwd.patch
 Patch7: control-center-2.14.2-gecos.patch
 Patch8: control-center-2.13.5-m4.patch
+Patch9: control-center-2.15.4-add-dbus-flags.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.gnome.org
@@ -128,6 +129,7 @@
 %patch6 -p1 -b .passwd
 %patch7 -p1 -b .gecos
 %patch8 -p1 -b .m4
+%patch9 -p1 -b .add-dbus-flags
 
 %build
 
@@ -246,6 +248,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-4
+- Add patch to use the dbus cflags and libs instead of relying on hal
+  flags to populate them
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 2.15.4-3
 - Add BR on dbus-glib-devel