From ba8957f6a0719a7bea898ed92cf976d36094b24f Mon Sep 17 00:00:00 2001
From: David Cantrell <dcantrel@fedoraproject.org>
Date: Nov 12 2007 16:49:15 +0000
Subject: - Put dhcp.schema in /etc/openldap/schema (#330471)


---

diff --git a/dhcp.spec b/dhcp.spec
index c9099fa..0de4532 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -13,7 +13,7 @@
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Name:     dhcp
 Version:  3.0.6
-Release:  11%{?dist}
+Release:  12%{?dist}
 Epoch:    12
 License:  ISC
 Group:    System Environment/Daemons
@@ -58,6 +58,8 @@ Patch20:  %{name}-3.0.6-ignore-hyphen-x.patch
 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
@@ -327,8 +329,8 @@ EOF
 %{__cp} -fp %SOURCE4 %{buildroot}%{_sysconfdir}
 
 # Install dhcp.schema for LDAP configuration
-%{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap
-%{__install} -p -m 0644 -D %SOURCE13 %{buildroot}%{_sysconfdir}/openldap
+%{__mkdir} -p %{buildroot}%{_sysconfdir}/openldap/schema
+%{__install} -p -m 0644 -D %SOURCE13 %{buildroot}%{_sysconfdir}/openldap/schema
 
 %{__install} -p -m 0644 -D libdhcp4client.pc %{buildroot}%{_libdir}/pkgconfig/libdhcp4client.pc
 
@@ -376,7 +378,7 @@ fi
 %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
@@ -432,6 +434,9 @@ fi
 %{_libdir}/libdhcp4client.a
 
 %changelog
+* Mon Nov 12 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.6-12
+- Put dhcp.schema in /etc/openldap/schema (#330471)
+
 * Thu Oct 25 2007 David Cantrell <dcantrell@redhat.com> - 12:3.0.6-11
 - Remove chkconfig usage for ypbind in dhclient-script (#351211)