rpms/kdebase/FC-5 kdebase-3.5.2-dbus.patch, 1.1, 1.2 kdebase.spec, 1.160, 1.161

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv20526

Modified Files:
	kdebase-3.5.2-dbus.patch kdebase.spec 
Log Message:
update dbus patch


kdebase-3.5.2-dbus.patch:
 kdebase-3.5.1/kioslave/media/configure.in.in             |   66 -
 kdebase-3.5.1/kioslave/media/mediamanager/connection.cpp |  168 ++++
 kdebase-3.5.1/kioslave/media/mediamanager/connection.h   |   86 ++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.cpp |  244 ++++++
 kdebase-3.5.1/kioslave/media/mediamanager/integrator.h   |   95 ++
 kdebase-3.5.1/kioslave/media/mediamanager/message.cpp    |  551 +++++++++++++++
 kdebase-3.5.1/kioslave/media/mediamanager/message.h      |  132 +++
 kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am    |   11 
 8 files changed, 1285 insertions(+), 68 deletions(-)

Index: kdebase-3.5.2-dbus.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-dbus.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-dbus.patch	30 Mar 2006 13:46:23 -0000	1.1
+++ kdebase-3.5.2-dbus.patch	4 Apr 2006 09:54:44 -0000	1.2
@@ -1298,7 +1298,7 @@
 +}
 +
 +#endif
---- kdebase-3.5.1/kioslave/media/configure.in.in.dbus	2006-01-26 15:45:06.000000000 +0100
+--- kdebase-3.5.1/kioslave/media/configure.in.in.tn	2006-01-26 15:45:06.000000000 +0100
 +++ kdebase-3.5.1/kioslave/media/configure.in.in	2006-01-26 15:53:54.000000000 +0100
 @@ -106,70 +106,6 @@
  
@@ -1380,3 +1380,39 @@
    AC_DEFINE_UNQUOTED([COMPILE_HALBACKEND],1, [media HAL backend compilation])
    HALBACKEND=yes
    AC_SUBST(HALBACKEND)
+--- kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am.tn	2006-04-03 23:29:27.000000000 +0200
++++ kdebase-3.5.2/kioslave/media/mediamanager/Makefile.am	2006-04-03 23:29:31.000000000 +0200
+@@ -1,17 +1,22 @@
+ kde_module_LTLIBRARIES = kded_mediamanager.la
+ 
+ if include_media_halbackend
+-HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS) $(DBUSQT_INCS)
++HALBACKEND_INCS = $(HAL_INCS) $(DBUS_INCS)
+ endif
+ 
+ METASOURCES = AUTO
+ INCLUDES = -I$(srcdir)/../libmediacommon -I../libmediacommon $(HALBACKEND_INCS) $(all_includes)
+ 
++DBUSQT3BINDING_LIB = libdbusqt3.la
++libdbusqt3_la_SOURCES = connection.cpp integrator.cpp message.cpp
++libdbusqt3_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
++libdbusqt3_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS)
++
+ if include_media_halbackend
+ HALBACKEND_LIB = libhalbackend.la
+ libhalbackend_la_SOURCES = halbackend.cpp
+ libhalbackend_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+-libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT_LIBS)
++libhalbackend_la_LIBADD = $(HAL_LIBS) $(DBUS_LIBS) $(DBUSQT3BINDING_LIB)
+ endif
+ 
+ if include_media_linuxcdpolling
+@@ -20,7 +25,7 @@
+ liblinuxcdpolling_la_LDFLAGS = -avoid-version $(all_libraries) -no-undefined
+ endif
+ 
+-noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB)
++noinst_LTLIBRARIES = $(LINUXCDPOLLING_LIB) $(HALBACKEND_LIB) $(DBUSQT3BINDING_LIB)
+ 
+ kded_mediamanager_la_SOURCES = mediamanager.cpp mediamanager.skel medialist.cpp backendbase.cpp fstabbackend.cpp removablebackend.cpp mediadirnotify.cpp mediadirnotify.skel
+ kded_mediamanager_la_LDFLAGS = $(all_libraries) -module -avoid-version


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase.spec,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- kdebase.spec	30 Mar 2006 13:46:23 -0000	1.160
+++ kdebase.spec	4 Apr 2006 09:54:44 -0000	1.161
@@ -20,7 +20,7 @@
 Summary: K Desktop Environment - core files
 Name: kdebase
 Version: 3.5.2
-Release: 0.1.fc5
+Release: 0.2.fc5
 Epoch: 6
 Url: http://www.kde.org
 Group: User Interface/Desktops
@@ -422,6 +422,9 @@
 %{_includedir}/kde/ksplash/*
 
 %changelog
+* Tue Apr 04 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.2.fc5
+- rebuilt
+
 * Thu Mar 30 2006 Than Ngo <than at redhat.com> 6:3.5.2-0.1.fc5
 - update to 3.5.2
 - drop kdebase-3.5.1-kwin-systray.patch, kdebase-3.5.1-keyboardlayout.patch,