rpms/dbus/FC-6 dbus.spec,1.112,1.113

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv12317

Modified Files:
	dbus.spec 
Log Message:
comment out some changes that needed to be reverted to get the
security update out the door



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- dbus.spec	16 Dec 2006 01:40:31 -0000	1.112
+++ dbus.spec	16 Dec 2006 02:45:57 -0000	1.113
@@ -111,11 +111,11 @@
 
 mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 
-install -m444 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
-install -m444 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
+#install -m444 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
+#install -m444 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1
 
-chmod 444 $RPM_BUILD_ROOT%{_datadir}/dbus-1/session.conf
-chmod 444 $RPM_BUILD_ROOT%{_datadir}/dbus-1/system.conf
+#chmod 444 $RPM_BUILD_ROOT%{_datadir}/dbus-1/session.conf
+#chmod 444 $RPM_BUILD_ROOT%{_datadir}/dbus-1/system.conf
 
 #change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
 sed -e 's at -I${libdir}@-I${prefix}/%{_lib}@' $RPM_BUILD_ROOT/%{_lib}/pkgconfig/dbus-1.pc > $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/dbus-1.pc
@@ -158,6 +158,7 @@
 %doc COPYING ChangeLog NEWS
 
 %dir %{_sysconfdir}/dbus-1
+%config %{_sysconfdir}/dbus-1/*.conf
 %config %{_sysconfdir}/rc.d/init.d/*
 %dir %{_sysconfdir}/dbus-1/system.d
 %dir %{_localstatedir}/run/dbus
@@ -171,8 +172,8 @@
 /%{_lib}/*dbus-1*.so.*
 %{_datadir}/man/man*/*
 %{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/*.conf
-%{_sysconfdir}/dbus-1/*.conf
+#%{_datadir}/dbus-1/*.conf
+#%{_sysconfdir}/dbus-1/*.conf
 
 %files x11
 %defattr(-,root,root)