rpms/dhcp/F-7 dhcp.spec,1.167,1.168

[David Cantrell (dcantrel)]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30265

Modified Files:
	dhcp.spec 
Log Message:
* Mon Nov 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-42
- Put dhcp.schema in /etc/openldap/schema (#330471)



Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/F-7/dhcp.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- dhcp.spec	23 Oct 2007 21:15:24 -0000	1.167
+++ dhcp.spec	12 Nov 2007 16:25:16 -0000	1.168
@@ -10,7 +10,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.5
-Release:  41%{?dist}
+Release:  42%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -58,6 +58,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: groff openldap-devel
 
+Requires: openldap-servers
+
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -335,8 +337,8 @@
 %{__cp} -fp %SOURCE4 %{buildroot}%{_sysconfdir}
 
 # Install dhcp.schema for LDAP configuration
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap
-%{__install} -p -m 0644 -D %SOURCE14 %{buildroot}%{_sysconfdir}/openldap
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
+%{__install} -p -m 0644 -D %SOURCE14 %{buildroot}%{_sysconfdir}/openldap/schema
 
 %{__install} -p -m 0644 -D libdhcp4client.pc %{buildroot}%{_libdir}/pkgconfig/libdhcp4client.pc
 
@@ -384,7 +386,7 @@
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcpd
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcrelay
 %config(noreplace) %{_sysconfdir}/dhcpd.conf
-%config(noreplace) %{_sysconfdir}/openldap/dhcp.schema
+%config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
 %{_initrddir}/dhcpd
 %{_initrddir}/dhcrelay
 %{_bindir}/omshell
@@ -440,6 +442,9 @@
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Mon Nov 12 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-42
+- Put dhcp.schema in /etc/openldap/schema (#330471)
+
 * Tue Oct 23 2007 David Cantrell <dcantrell at redhat.com> - 12:3.0.5-41
 - Add missing /etc/openldap/dhcp.schema file (#330471)