rpms/dbus/FC-6 dbus.spec,1.107,1.108

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	dbus.spec 
Log Message:
- don't die when reloading config, if config file gains new
  options that aren't understood (one more try at bug 218207)



Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- dbus.spec	14 Dec 2006 16:37:44 -0000	1.107
+++ dbus.spec	15 Dec 2006 01:09:40 -0000	1.108
@@ -8,13 +8,14 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.1 
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-root
 PreReq: /usr/sbin/useradd
+PreReq: selinux-policy-targeted >= 2.4.6-7.fc6
 Requires: chkconfig >= 1.3.26
 BuildPreReq: libtool
 #BuildRequires: redhat-release 
@@ -28,7 +29,6 @@
 Requires: libxml2-python
 
 Conflicts: cups < 1:1.1.20-4
-Conflicts: selinux-policy-targeted < 2.4.6-7.fc6
 
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
@@ -176,6 +176,10 @@
 %{_includedir}/*
 
 %changelog
+* Thu Dec 14 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-4
+- don't die when reloading config, if config file gains new
+  options that aren't understood (one more try at bug 218207)
+
 * Thu Dec 14 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-3
 - don't die when reloading config, if config file gains new
   options that aren't understood (bug 218207)