Author: jajcus Date: Mon Jul 2 06:51:27 2012 GMT Module: packages Tag: HEAD ---- Log message: - 'without ldap' bcond added - libvirt and python-pexpect BR required, they were for fence agents which are now in a separate package
---- Files affected: packages/cluster: cluster.spec (1.7 -> 1.8) , cluster-no_ldap.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/cluster/cluster.spec diff -u packages/cluster/cluster.spec:1.7 packages/cluster/cluster.spec:1.8 --- packages/cluster/cluster.spec:1.7 Sun Jul 1 13:25:03 2012 +++ packages/cluster/cluster.spec Mon Jul 2 08:51:22 2012 @@ -1,27 +1,29 @@ # $Revision$, $Date$ # +# Conditional build: +%bcond_without ldap # do not include ldap support + Summary: Cluster infrastructure Summary(pl.UTF-8): Infrastruktura klastra Name: cluster Version: 3.1.8 -Release: 1 +Release: 1.aos1 License: GPL v2 Group: Applications/System Source0: https://fedorahosted.org/releases/c/l/cluster/%{name}-%{version}.tar.bz2 # Source0-md5: 25699384c42c28bbec2998c25e7a8300 Source1: %{name}.tmpfiles +Patch0: %{name}-no_ldap.patch URL: http://sources.redhat.com/cluster/wiki BuildRequires: corosync-devel >= 1.4.1 -BuildRequires: libvirt-devel BuildRequires: libxml2-devel BuildRequires: libxslt-progs BuildRequires: ncurses-devel BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: openais-devel >= 1.1.4 -BuildRequires: openldap-devel +%{?with_ldap:BuildRequires: openldap-devel} BuildRequires: perl-ExtUtils-MakeMaker -BuildRequires: python-pexpect BuildRequires: slang-devel Requires: %{name}-cman = %{version}-%{release} Requires: %{name}-rgmanager = %{version}-%{release} @@ -297,6 +299,7 @@ %prep %setup -q +%{!?with_ldap:%patch0 -p1} sed -i -e 's,-Wall,%{rpmcflags} -I/usr/include/ncurses -Wall,' make/defines.mk.input @@ -332,7 +335,9 @@ %files ccs %defattr(644,root,root,755) +%if %{with ldap} %attr(755,root,root) %{_sbindir}/confdb2ldif +%endif %attr(755,root,root) %{_sbindir}/ccs_config_dump %attr(755,root,root) %{_sbindir}/ccs_config_validate %attr(755,root,root) %{_sbindir}/ccs_test @@ -343,7 +348,9 @@ %{_mandir}/man8/ccs_config_validate.* %{_mandir}/man8/ccs_tool.* %{_mandir}/man8/ccs_update_schema.* +%if %{with ldap} %{_mandir}/man8/confdb2ldif.* +%endif %attr(700,root,root) /var/run/cluster %{systemdtmpfilesdir}/%{name}.conf @@ -506,6 +513,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2012/07/02 06:51:22 jajcus +- 'without ldap' bcond added +- libvirt and python-pexpect BR required, they were for fence agents which are + now in a separate package + Revision 1.7 2012/07/01 11:25:03 jajcus - adapterized - missing descriptions added ================================================================ Index: packages/cluster/cluster-no_ldap.patch diff -u /dev/null packages/cluster/cluster-no_ldap.patch:1.1 --- /dev/null Mon Jul 2 08:51:28 2012 +++ packages/cluster/cluster-no_ldap.patch Mon Jul 2 08:51:22 2012 @@ -0,0 +1,19 @@ +diff -dur cluster-3.1.8.orig/config/plugins/Makefile cluster-3.1.8/config/plugins/Makefile +--- cluster-3.1.8.orig/config/plugins/Makefile 2011-12-03 18:53:15.000000000 +0100 ++++ cluster-3.1.8/config/plugins/Makefile 2012-07-02 08:35:18.000000000 +0200 +@@ -1,4 +1,4 @@ + include ../../make/defines.mk + include $(OBJDIR)/make/passthrough.mk + +-SUBDIRS = xml ldap ++SUBDIRS = xml +Only in cluster-3.1.8/config/plugins: Makefile~ +diff -dur cluster-3.1.8.orig/config/tools/Makefile cluster-3.1.8/config/tools/Makefile +--- cluster-3.1.8.orig/config/tools/Makefile 2011-12-03 18:53:15.000000000 +0100 ++++ cluster-3.1.8/config/tools/Makefile 2012-07-02 08:35:01.000000000 +0200 +@@ -1,4 +1,4 @@ + include ../../make/defines.mk + include $(OBJDIR)/make/passthrough.mk + +-SUBDIRS=ccs_tool ldap xml man ++SUBDIRS=ccs_tool xml man ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/cluster/cluster.spec?r1=1.7&r2=1.8 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
