Author: arekm Date: Sat Apr 10 18:02:42 2010 GMT Module: packages Tag: HEAD ---- Log message: - ldap bcond
---- Files affected: packages/heimdal: heimdal.spec (1.193 -> 1.194) ---- Diffs: ================================================================ Index: packages/heimdal/heimdal.spec diff -u packages/heimdal/heimdal.spec:1.193 packages/heimdal/heimdal.spec:1.194 --- packages/heimdal/heimdal.spec:1.193 Sat Apr 10 18:44:58 2010 +++ packages/heimdal/heimdal.spec Sat Apr 10 20:02:34 2010 @@ -2,12 +2,13 @@ # # Conditional build: %bcond_without x11 # without X11-based utilities +%bcond_without ldap # Summary: Heimdal implementation of Kerberos V5 system Summary(pl.UTF-8): Implementacja Heimdal systemu Kerberos V5 Name: heimdal Version: 1.3.1 -Release: 6 +Release: 7 License: Free Group: Networking Source0: http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz @@ -50,7 +51,7 @@ BuildRequires: libtool >= 2:2.2 BuildRequires: mawk BuildRequires: ncurses-devel >= 5.1 -BuildRequires: openldap-devel >= 2.3.0 +%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0} BuildRequires: openssl-devel >= 0.9.7d BuildRequires: readline-devel >= 5.0 BuildRequires: rpmbuild(macros) >= 1.268 @@ -363,14 +364,16 @@ %{__autoconf} %{__automake} %configure \ +%if %{with ldap} --enable-hdb-openldap-module \ + --with-openldap=/usr \ +%endif --enable-kcm \ --enable-pthread-support \ --enable-shared \ --enable-static \ --with-hdbdir=%{_localstatedir} \ --with-ipv6 \ - --with-openldap=/usr \ --with-readline=/usr \ --with-sqlite3=/usr \ --with%{!?with_x11:out}-x @@ -502,6 +505,7 @@ /sbin/ldconfig [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1 +%if %{with ldap} %post -n openldap-schema-heimdal %openldap_schema_register %{schemadir}/hdb.schema %service -q ldap restart @@ -511,6 +515,7 @@ %openldap_schema_unregister %{schemadir}/hdb.schema %service -q ldap restart fi +%endif %triggerpostun libs -- heimdal-libs < 1.2.1-6 if [ -f /etc/heimdal/krb5.conf.rpmsave ]; then @@ -620,6 +625,7 @@ %{_mandir}/man5/mech.5* %{_mandir}/man8/kerberos.8* +%if %{with ldap} %files ldap %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/hdb_ldap.so @@ -627,6 +633,7 @@ %files -n openldap-schema-heimdal %defattr(644,root,root,755) %{schemadir}/*.schema +%endif %files devel %defattr(644,root,root,755) @@ -780,6 +787,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.194 2010/04/10 18:02:34 arekm +- ldap bcond + Revision 1.193 2010/04/10 16:44:58 arekm - release 6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.193&r2=1.194&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
