packages: heimdal/heimdal.spec - rel 7 - install kcm internal headers only ...

[baggins]

Author: baggins                      Date: Sun Oct 17 23:40:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7
- install kcm internal headers only if explicitly requested (bcond)

---- Files affected:
packages/heimdal:
   heimdal.spec (1.218 -> 1.219) 

---- Diffs:

================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.218 packages/heimdal/heimdal.spec:1.219
--- packages/heimdal/heimdal.spec:1.218	Sat Oct 16 11:20:35 2010
+++ packages/heimdal/heimdal.spec	Mon Oct 18 01:39:59 2010
@@ -3,12 +3,13 @@
 # Conditional build:
 %bcond_without	x11	# X11-based utilities
 %bcond_without	ldap	# LDAP plugin
+%bcond_with	expose_internals	# install internal KCM headers
 #
 Summary:	Heimdal implementation of Kerberos V5 system
 Summary(pl.UTF-8):	Implementacja Heimdal systemu Kerberos V5
 Name:		heimdal
 Version:	1.4
-Release:	6
+Release:	7
 License:	Free
 Group:		Networking
 Source0:	http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
@@ -426,6 +427,7 @@
 	ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/$lib.*.*) $RPM_BUILD_ROOT%{_libdir}/$lib
 done
 
+%if %{with expose_internals}
 # install definitions of KCM internal data structures to get KCM support in nfs-utils
 install -d $RPM_BUILD_ROOT%{_includedir}/kcm
 _mutexdef=$(cat << EOF | %{__cc} -E -I./include - | sed 's/_HEIMDAL_MUTEX \(.*\)/\1/p; d'
@@ -439,6 +441,7 @@
 	-e 's/<kcm\.h>/<kcm\/kcm.h>/' \
 	-e "s/HEIMDAL_MUTEX/$_mutexdef/g" kcm/kcm_locl.h >$RPM_BUILD_ROOT%{_includedir}/kcm/kcm_locl.h
 install -p lib/krb5/kcm.h $RPM_BUILD_ROOT%{_includedir}/kcm
+%endif
 
 # just a test plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/windc.*
@@ -685,7 +688,7 @@
 %{_includedir}/*.h
 %{_includedir}/gssapi
 %{_includedir}/kadm5
-%{_includedir}/kcm
+%{?with_expose_internals:%{_includedir}/kcm}
 %{_includedir}/krb5
 %{_includedir}/roken
 %{_pkgconfigdir}/heimdal-gssapi.pc
@@ -811,6 +814,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.219  2010/10/17 23:39:59  baggins
+- rel 7
+- install kcm internal headers only if explicitly requested (bcond)
+
 Revision 1.218  2010/10/16 09:20:35  arekm
 - rel 6; revert latest change as it is not needed in multilib environment (just make sure you install the same package versions of botch arch)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.218&r2=1.219&f=u