Author: lisu Date: Wed Dec 15 14:57:12 2010 GMT Module: packages Tag: HEAD ---- Log message: - add krb5 bcond (default off)
---- Files affected: packages/root: root.spec (1.33 -> 1.34) ---- Diffs: ================================================================ Index: packages/root/root.spec diff -u packages/root/root.spec:1.33 packages/root/root.spec:1.34 --- packages/root/root.spec:1.33 Wed Dec 15 15:33:10 2010 +++ packages/root/root.spec Wed Dec 15 15:57:07 2010 @@ -6,6 +6,9 @@ # - xrootd is disabled because of errors - re-enable it in future # - files # +#Conditional build: +%bcond_with krb5 # build with MIT kerberos +# Summary: An object-oriented data analysis environment Summary(pl.UTF-8): Obiektowo zorientowane środowisko do analizowania danych Name: root @@ -27,7 +30,11 @@ BuildRequires: giflib-devel BuildRequires: gmp-devel BuildRequires: gsl-devel >= 1.8 -BuildRequires: heimdal-devel +%if %{with krb5} +BuildRequires: krb5-devel +%else +BuildRequires: heimdal-devel +%endif BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -85,7 +92,7 @@ --disable-builtin-pcre \ --disable-builtin-zlib \ --disable-xrootd \ - --disable-krb5 \ + %{!?with_krb5:--disable-krb5} \ --enable-gsl-shared \ --with-cc="%{__cc} %{rpmcflags}" \ --with-cxx="%{__cxx} %{rpmcxxflags}" \ @@ -120,6 +127,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.34 2010/12/15 14:57:07 lisu +- add krb5 bcond (default off) + Revision 1.33 2010/12/15 14:33:10 lisu - disable krb5 just for test build ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/root/root.spec?r1=1.33&r2=1.34&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit