Author: glen Date: Sat Mar 5 20:42:43 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- also enable dependant schemas for samba.schema
---- Files affected:
SPECS:
samba.spec (1.266 -> 1.267)
---- Diffs:
================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.266 SPECS/samba.spec:1.267
--- SPECS/samba.spec:1.266 Sat Mar 5 21:14:33 2005
+++ SPECS/samba.spec Sat Mar 5 21:42:38 2005
@@ -6,6 +6,7 @@
# - review configure options
# - fix broken --without ldap, test functionality with other bconds
# - check tdbtool (with tdb.spec)
+# - when pl for openldap-schema-samba done, rel up and STBR
#
# Conditional build:
%bcond_without ads # without ActiveDirectory support
@@ -40,7 +41,7 @@
Summary(zh_CN): Samba żÍť§śËşÍˇţÎńĆ÷
Name: samba
Version: 3.0.11
-Release: 2
+Release: 2.3
Epoch: 1
License: GPL v2
Group: Networking/Daemons
@@ -1057,7 +1058,13 @@
/^include.*local.schema/{
i\
include %{schemadir}/samba.schema
- }' /etc/openldap/slapd.conf
+ }
+
+ # enable dependant schemas: cosine(uid)
inetorgperson(displayName) nis(gidNumber)
+ /^#include.*\(cosine\|inetorgperson\|nis\)\.schema/{
+ s/^#//
+ }
+ ' /etc/openldap/slapd.conf
fi
if [ -f /var/lock/subsys/ldap ]; then
@@ -1069,6 +1076,9 @@
if grep -q %{schemadir}/samba.schema /etc/openldap/slapd.conf; then
sed -i -e '
/^include.*\/usr\/share\/openldap\/schema\/samba.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
@@ -1398,6 +1408,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.267 2005/03/05 20:42:38 glen
+- also enable dependant schemas for samba.schema
+
Revision 1.266 2005/03/05 20:14:33 glen
- add openldap-schema-samba package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/samba.spec?r1=1.266&r2=1.267&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
