Author: glen Date: Tue Mar 8 01:32:29 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't build openldap-schema if bcond ldap is off
---- Files affected:
SPECS:
samba.spec (1.268 -> 1.269)
---- Diffs:
================================================================
Index: SPECS/samba.spec
diff -u SPECS/samba.spec:1.268 SPECS/samba.spec:1.269
--- SPECS/samba.spec:1.268 Mon Mar 7 20:07:08 2005
+++ SPECS/samba.spec Tue Mar 8 02:32:24 2005
@@ -2,7 +2,6 @@
#
# TODO:
# - look into other distro specs for valid %descriptions for samba 3
-# - when pl for openldap-schema-samba done, rel up and STBR
#
# Conditional build:
%bcond_without ads # without ActiveDirectory support
@@ -13,7 +12,7 @@
%bcond_without pgsql # without PostgreSQL support
%bcond_without python # without python libs/utils
%bcond_with ldapsam # with LDAP SAM 2.2 based auth (instead of
smbpasswd)
-#
+
# ADS requires krb5 and LDAP
%if %{without krb5} || %{without ldap}
%undefine with_ads
@@ -37,7 +36,7 @@
Summary(zh_CN): Samba żÍť§śËşÍˇţÎńĆ÷
Name: samba
Version: 3.0.11
-Release: 2.3
+Release: 2.5
Epoch: 1
License: GPL v2
Group: Networking/Daemons
@@ -855,6 +854,7 @@
dostępu do plików korzystając z oprogramowania antywirusowego Trend
(które musi być zainstalowane, aby wykorzystać ten moduł).
+%if %{with ldap}
%package -n openldap-schema-samba
Summary: Samba LDAP schema
Summary(pl): Schemat LDAP dla samby
@@ -867,6 +867,7 @@
%description -n openldap-schema-samba -l pl
Ten pakiet zawiera schemat samby dla openldap-a.
+%endif
%prep
%setup -q
@@ -1003,7 +1004,9 @@
mv $RPM_BUILD_ROOT%{_bindir}/tdbtool $RPM_BUILD_ROOT%{_bindir}/tdbtool_samba
+%if %{with ldap}
install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -1052,6 +1055,7 @@
/etc/rc.d/init.d/rc-inetd reload
fi
+%if %{with ldap}
%post -n openldap-schema-samba
if ! grep -q %{schemadir}/samba.schema /etc/openldap/slapd.conf; then
sed -i -e '
@@ -1068,7 +1072,7 @@
fi
if [ -f /var/lock/subsys/ldap ]; then
- /etc/rc.d/init.d/ldap restart >&2
+ /etc/rc.d/init.d/ldap restart >&2
fi
%postun -n openldap-schema-samba
@@ -1086,6 +1090,7 @@
/etc/rc.d/init.d/ldap restart >&2 || :
fi
fi
+%endif
%triggerpostun -- samba < 1.9.18p7
if [ "$1" != "0" ]; then
@@ -1398,9 +1403,11 @@
%config(noreplace) %verify(not size mtime md5)
%{_sysconfdir}/samba/vscan-trend.conf
%attr(755,root,root) %{_vfsdir}/vscan-trend.so
+%if %{with ldap}
%files -n openldap-schema-samba
%defattr(644,root,root,755)
%{schemadir}/*.schema
+%endif
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -1408,6 +1415,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.269 2005/03/08 01:32:24 glen
+- don't build openldap-schema if bcond ldap is off
+
Revision 1.268 2005/03/07 19:07:08 tommat
- added pl translation to openldap-schema package
- updated todo
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/samba.spec?r1=1.268&r2=1.269&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
