diff --git a/rudder-inventory-ldap/SOURCES/.dependencies b/rudder-inventory-ldap/SOURCES/.dependencies index 110b63c6c..138e450dc 100644 --- a/rudder-inventory-ldap/SOURCES/.dependencies +++ b/rudder-inventory-ldap/SOURCES/.dependencies @@ -1,5 +1,5 @@ -SLES11:gcc cyrus-sasl-devel libopenssl-devel -SLES10:gcc cyrus-sasl-devel openssl-devel -RHEL5:gcc cyrus-sasl-devel openssl-devel libtool-ltdl-devel -RHEL6:gcc cyrus-sasl-devel openssl-devel libtool-ltdl-devel -RHEL7:gcc cyrus-sasl-devel openssl-devel libtool-ltdl-devel +SLES11:gcc libopenssl-devel +SLES10:gcc openssl-devel +RHEL5:gcc openssl-devel libtool-ltdl-devel +RHEL6:gcc openssl-devel libtool-ltdl-devel +RHEL7:gcc openssl-devel libtool-ltdl-devel diff --git a/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec b/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec index be85bfe50..c6523fd32 100644 --- a/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec +++ b/rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec @@ -34,8 +34,6 @@ %define ruddervardir /var/rudder %define rudderlogdir /var/log/rudder -%define openldap_release 2.4.23 - %if 0%{?sles_version} %define syslogservicename syslog %endif @@ -77,8 +75,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Generic requirements -BuildRequires: gcc cyrus-sasl-devel -Requires: rsyslog cyrus-sasl openssl +BuildRequires: gcc +Requires: rsyslog openssl #Specific requirements @@ -144,7 +142,7 @@ export LD_LIBRARY_PATH="/opt/rudder/lib" export CPPFLAGS="-I/opt/rudder/include" export LDFLAGS="-L/opt/rudder/lib" -./configure --build=%{_target} --prefix=%{rudderdir} --libdir=%{rudderdir}/lib/ldap --enable-dynamic --enable-debug --enable-modules --enable-hdb=mod --enable-monitor=mod --enable-dynlist=mod --with-cyrus-sasl +./configure --build=%{_target} --prefix=%{rudderdir} --libdir=%{rudderdir}/lib/ldap --enable-dynamic --enable-debug --enable-modules --enable-hdb=mod --enable-monitor=mod --enable-dynlist=mod make %{?_smp_mflags} depend make %{?_smp_mflags} diff --git a/rudder-inventory-ldap/debian/control b/rudder-inventory-ldap/debian/control index 376f223ee..122150a27 100644 --- a/rudder-inventory-ldap/debian/control +++ b/rudder-inventory-ldap/debian/control @@ -2,7 +2,7 @@ Source: rudder-inventory-ldap Section: net Priority: extra Maintainer: Rudder packaging team -Build-Depends: debhelper (>= 7), libltdl3-dev, libssl-dev, libsasl2-dev +Build-Depends: debhelper (>= 7), libltdl3-dev, libssl-dev Standards-Version: 3.8.0 Homepage: http://www.rudder-project.org diff --git a/rudder-inventory-ldap/debian/rules b/rudder-inventory-ldap/debian/rules index e302a2573..157b7ca49 100755 --- a/rudder-inventory-ldap/debian/rules +++ b/rudder-inventory-ldap/debian/rules @@ -19,7 +19,7 @@ configure-stamp: CPPFLAGS="-I$(CURDIR)/debian/tmp/opt/rudder/include" \ CFLAGS="-I$(CURDIR)/debian/tmp/opt/rudder/include" \ LDFLAGS="-L$(CURDIR)/debian/tmp/opt/rudder/lib" \ - ./configure --prefix=/opt/rudder --libdir=/opt/rudder/lib/ldap --enable-dynamic --enable-debug --enable-modules --enable-hdb=mod --enable-monitor=mod --enable-dynlist=mod --with-cyrus-sasl + ./configure --prefix=/opt/rudder --libdir=/opt/rudder/lib/ldap --enable-dynamic --enable-debug --enable-modules --enable-hdb=mod --enable-monitor=mod --enable-dynlist=mod touch configure-stamp