packages: bind/bind.spec - rel 2 - cleaned up openldap-schema-bind package

[baggins]

Author: baggins                      Date: Mon Aug 24 13:22:26 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- cleaned up openldap-schema-bind package

---- Files affected:
packages/bind:
   bind.spec (1.291 -> 1.292) 

---- Diffs:

================================================================
Index: packages/bind/bind.spec
diff -u packages/bind/bind.spec:1.291 packages/bind/bind.spec:1.292
--- packages/bind/bind.spec:1.291	Wed Jul 29 09:08:03 2009
+++ packages/bind/bind.spec	Mon Aug 24 15:22:20 2009
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - schema regstering in openldap-schema-bind
 # - apply http://www.caraytech.com/geodns/
 #
 # Conditional build:
@@ -27,7 +26,7 @@
 %define	plev	P1
 Name:		bind
 Version:	%{ver}.%{plev}
-Release:	1
+Release:	2
 Epoch:		7
 License:	BSD-like
 Group:		Networking/Daemons
@@ -85,6 +84,8 @@
 Conflicts:	kernel < 2.2.18
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		schemadir	/usr/share/openldap/schema
+
 %description
 BIND (Berkeley Internet Name Domain) is an implementation of the DNS
 (Domain Name System) protocols. BIND includes a DNS server (named),
@@ -324,8 +325,9 @@
 Summary:	BIND schema for openldap
 Summary(pl.UTF-8):	Schemat BIND dla openldap
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires(post,postun):	sed >= 4.0
 Requires:	openldap-servers
+Requires:	sed >= 4.0
 
 %description -n openldap-schema-bind
 BIND schema for openldap.
@@ -400,8 +402,11 @@
 
 touch $RPM_BUILD_ROOT%{_var}/lib/named/named.{log,stats}
 
-%{?with_ldap:install -d $RPM_BUILD_ROOT%{_datadir}/openldap/schema}
-%{?with_ldap:install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/openldap/schema/dnszone.schema}
+%if %{with ldap}
+install -d $RPM_BUILD_ROOT%{schemadir}
+install %{SOURCE5} $RPM_BUILD_ROOT%{schemadir}/dnszone.schema
+%endif
+
 %{?with_hip:install bind-hip/hi2dns $RPM_BUILD_ROOT%{_bindir}}
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/named-compilezone.8
@@ -447,6 +452,16 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
+%post -n openldap-schema-bind
+%openldap_schema_register %{schemadir}/dnszone.schema
+%service -q ldap restart
+
+%postun -n openldap-schema-bind
+if [ "$1" = "0" ]; then
+	%openldap_schema_unregister %{schemadir}/dnszone.schema
+	%service -q ldap restart
+fi
+
 %triggerpostun -- %{name} < 7:9.4.2-2
 /sbin/chkconfig named reset
 #triggerpostun -- %{name} < 6:9.4.1
@@ -578,6 +593,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.292  2009/08/24 13:22:20  baggins
+- rel 2
+- cleaned up openldap-schema-bind package
+
 Revision 1.291  2009/07/29 07:08:03  arekm
 - up to 9.6.1-P1 (fixes CVE-2009-0696)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bind/bind.spec?r1=1.291&r2=1.292&f=u