Author: rhafer Date: Fri Jun 27 16:01:10 2008 New Revision: 48658 URL: http://svn.opensuse.org/viewcvs/yast?rev=48658&view=rev Log: fixed RPM building Modified: trunk/ldap-server/configure.in.in trunk/ldap-server/src/agent/Makefile.am trunk/ldap-server/src/lib/Makefile.am trunk/ldap-server/yast2-ldap-server.spec.in Modified: trunk/ldap-server/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/configure.in.in?rev=4... ============================================================================== --- trunk/ldap-server/configure.in.in (original) +++ trunk/ldap-server/configure.in.in Fri Jun 27 16:01:10 2008 @@ -16,6 +16,11 @@ if [[ "$yast_found_ldapcpplib" = "no" ]]; then AC_MSG_ERROR(Headers for ldapcpplib are missing. Please install the package ldapcpplib-devel.) fi +yast_found_boost=no +AC_CHECK_HEADER(boost/shared_ptr.hpp,[yast_found_boost=yes]) +if [[ "$yast_found_boost" = "no" ]]; then + AC_MSG_ERROR(Boost Headers are missing. Please install the package boost-devel.) +fi AC_LANG_POP(C++) ## and generate the output... Modified: trunk/ldap-server/src/agent/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/Makefile.am... ============================================================================== --- trunk/ldap-server/src/agent/Makefile.am (original) +++ trunk/ldap-server/src/agent/Makefile.am Fri Jun 27 16:01:10 2008 @@ -14,7 +14,8 @@ libpy2ag_slapdconfig_la_SOURCES = \ $(liby2ag_slapdconfig_la_SOURCES) \ - Y2CCSlapdConfigAgent.cc #Y2CCLdapAgent.h + Y2CCSlapdConfigAgent.cc + libpy2ag_slapdconfig_la_LDFLAGS = -version-info 2:0 libpy2ag_slapdconfig_la_LIBADD = ../lib/libslapdconfig.la @AGENT_LIBADD@ -L$(libdir) Modified: trunk/ldap-server/src/lib/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/Makefile.am?r... ============================================================================== --- trunk/ldap-server/src/lib/Makefile.am (original) +++ trunk/ldap-server/src/lib/Makefile.am Fri Jun 27 16:01:10 2008 @@ -2,7 +2,7 @@ libslapdconfig_la_SOURCES = slapd-config.cpp -include_HEADERS = slapd-config.h +noinst_HEADERS = slapd-config.h libslapdconfig_la_LIBADD = -lldapcpp libslapdconfig_la_LDFLAGS = -version-info 0:1:0 Modified: trunk/ldap-server/yast2-ldap-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/yast2-ldap-server.spe... ============================================================================== --- trunk/ldap-server/yast2-ldap-server.spec.in (original) +++ trunk/ldap-server/yast2-ldap-server.spec.in Fri Jun 27 16:01:10 2008 @@ -1,11 +1,9 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools +BuildRequires: pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools libldapcpp-devel boost-devel gcc-c++ Requires: acl yast2 yast2-users yast2-ldap-client yast2-network perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools -BuildArchitectures: noarch - Summary: Configuration of the OpenLDAP server %description @@ -16,6 +14,8 @@ @BUILD@ @INSTALL@ +rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.so @CLEAN@ @@ -23,13 +23,14 @@ %defattr(-,root,root) %dir @yncludedir@/ldap-server %dir @moduledir@/YaPI +%{_libdir}/libslapdconfig.so.* @yncludedir@/ldap-server/* @clientdir@/ldap-server.ycp @clientdir@/ldap-server_*.ycp @moduledir@/LdapServer.* @moduledir@/YaPI/LdapServer.pm @desktopdir@/ldap-server.desktop +@plugindir@/libpy2ag_slapdconfig.* @schemadir@/autoyast/rnc/ldap-server.rnc @scrconfdir@/* -@agentdir@/* %doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org