From 259e6fd97d35be67fb75ae0f869a647b85284a97 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Fri, 2 Jun 2006 21:18:49 +0000
Subject: [PATCH] - use %openldap_schema_{un,}register macros

Changed files:
    courier-authlib.spec -> 1.43
---
 courier-authlib.spec | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/courier-authlib.spec b/courier-authlib.spec
index 2d7fd67..d1ead2c 100644
--- a/courier-authlib.spec
+++ b/courier-authlib.spec
@@ -22,7 +22,7 @@ BuildRequires:	mysql-devel
 BuildRequires:	openldap-devel >= 2.3.0
 BuildRequires:	pam-devel
 BuildRequires:	postgresql-devel
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.304
 BuildRequires:	sed >= 4.0
 BuildRequires:	sysconftool
 BuildRequires:	zlib-devel
@@ -360,32 +360,12 @@ fi
 %service -q courier-authlib restart
 
 %post -n openldap-schema-courier
-if ! grep -q %{schemadir}/courier.schema /etc/openldap/slapd.conf; then
-	sed -i -e '
-		/^include.*local.schema/{
-			i\
-include		%{schemadir}/courier.schema
-		}
-
-		# enable dependant schemas: nis.schema, cosine.schema
-		/^#include.*\(nis\|cosine\)\.schema/{
-			s/^#//
-		}
-	' /etc/openldap/slapd.conf
-fi
+%openldap_schema_register %{schemadir}/courier.schema -d nis,cosine
 %service -q ldap restart
 
 %postun -n openldap-schema-courier
 if [ "$1" = "0" ]; then
-	if grep -q %{schemadir}/courier.schema /etc/openldap/slapd.conf; then
-		sed -i -e '
-		/^include.*\/usr\/share\/openldap\/schema\/courier.schema/d
-
-		# for symmetry it would be nice if we disable enabled schemas in post,
-		# but we really can not do that, it would break something else.
-		' /etc/openldap/slapd.conf
-	fi
-
+	%openldap_schema_unregister %{schemadir}/courier.schema
 	%service -q ldap restart
 fi
 
-- 
2.44.0