diff --git a/openldap2-client.changes b/openldap2-client.changes index 3ee99fd..6feafad 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Tue Mar 6 12:23:09 UTC 2012 - rhafer@suse.de +Mon Apr 23 07:08:13 UTC 2012 - rhafer@suse.de + +- Disabled testsuite for now. Causes problems in the buildserivce + +------------------------------------------------------------------- +Tue Mar 6 12:23:35 UTC 2012 - rhafer@suse.de - Update to 2.4.30 * Fixed libldap socket polling for writes (ITS#7167) diff --git a/openldap2-client.spec b/openldap2-client.spec index 125076e..6993508 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2-client +# spec file for package openldap2 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,34 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define run_test_suite 1 +%define run_test_suite 0 -Name: openldap2-client -BuildRequires: cyrus-sasl-devel libopenssl-devel libtool +Name: openldap2-client +License: OLDAP-2.8 +BuildRequires: cyrus-sasl-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -libopenssl-devel -pwdutils openssl-devel +BuildRequires: -libopenssl-devel +BuildRequires: -pwdutils +BuildRequires: openssl-devel %endif Version: 2.4.30 -Release: 1 +Release: 0 Url: http://www.openldap.org -License: OLDAP-2.8 %if "%{name}" == "openldap2" -BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel +BuildRequires: db-devel +BuildRequires: openslp-devel +BuildRequires: tcpd-devel +BuildRequires: unixODBC-devel %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -db-devel libdb-4_5-devel +BuildRequires: -db-devel +BuildRequires: libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Clients Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep -Summary: The OpenLDAP commandline client tools -%else +Summary: The OpenLDAP Server Group: Productivity/Networking/LDAP/Clients +%else Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} Summary: The OpenLDAP commandline client tools +Group: Productivity/Networking/LDAP/Clients %endif Source: openldap-%{version}.tgz Source1: openldap-rc.tgz @@ -70,19 +77,11 @@ online directory services. It runs directly over TCP and can be used to access a stand-alone LDAP directory service or to access a directory service that has an X.500 back-end. -This package contains the OpenLDAP client utilities. - -The Lightweight Directory Access Protocol (LDAP) is used to access -online directory services. It runs directly over TCP and can be used to -access a stand-alone LDAP directory service or to access a directory -service that has an X.500 back-end. - -This package contains the OpenLDAP client utilities. - %package -n openldap2-back-perl Summary: OpenLDAP Perl Back-End -Requires: openldap2 = %{version} perl = %{perl_version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} +Requires: perl = %{perl_version} %description -n openldap2-back-perl The OpenLDAP Perl back-end allows you to execute Perl code specific to @@ -90,8 +89,8 @@ different LDAP operations. %package -n openldap2-back-meta Summary: OpenLDAP Meta Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz %description -n openldap2-back-meta @@ -102,8 +101,8 @@ Information Tree (DIT). %package -n openldap2-back-sql Summary: OpenLDAP SQL Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} %description -n openldap2-back-sql The primary purpose of this OpenLDAP backend is to present information @@ -124,22 +123,11 @@ The OpenLDAP Admin Guide plus a set of OpenLDAP related IETF internet drafts %else %description -The Lightweight Directory Access Protocol (LDAP) is used to access -online directory services. It runs directly over TCP and can be used to -access a stand-alone LDAP directory service or to access a directory -service that has an X.500 back-end. - -This package contains the OpenLDAP client utilities. - -The Lightweight Directory Access Protocol (LDAP) is used to access -online directory services. It runs directly over TCP and can be used to -access a stand-alone LDAP directory service or to access a directory -service that has an X.500 back-end. - This package contains the OpenLDAP client utilities. %package -n openldap2-devel Summary: Libraries, Header Files and Documentation for OpenLDAP +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: openldap2-devel-64bit @@ -147,11 +135,14 @@ Obsoletes: openldap2-devel-64bit # Conflicts: openldap-devel %if %suse_version >= 1110 -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: libopenssl-devel %else -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel openssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: openssl-devel %endif -Group: Development/Libraries/C and C++ %description -n openldap2-devel This package provides the OpenLDAP libraries, header files, and diff --git a/openldap2.changes b/openldap2.changes index e681e23..6feafad 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 23 07:08:13 UTC 2012 - rhafer@suse.de + +- Disabled testsuite for now. Causes problems in the buildserivce + ------------------------------------------------------------------- Tue Mar 6 12:23:35 UTC 2012 - rhafer@suse.de diff --git a/openldap2.spec b/openldap2.spec index c97100d..a69f1ba 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -15,34 +15,41 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define run_test_suite 0 Name: openldap2 -BuildRequires: cyrus-sasl-devel libopenssl-devel libtool +License: OLDAP-2.8 +BuildRequires: cyrus-sasl-devel +BuildRequires: libopenssl-devel +BuildRequires: libtool %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -libopenssl-devel -pwdutils openssl-devel +BuildRequires: -libopenssl-devel +BuildRequires: -pwdutils +BuildRequires: openssl-devel %endif Version: 2.4.30 -Release: 1 +Release: 0 Url: http://www.openldap.org -License: OLDAP-2.8 %if "%{name}" == "openldap2" -BuildRequires: db-devel openslp-devel tcpd-devel unixODBC-devel +BuildRequires: db-devel +BuildRequires: openslp-devel +BuildRequires: tcpd-devel +BuildRequires: unixODBC-devel %if %sles_version == 9 || %sles_version == 10 -BuildRequires: -db-devel libdb-4_5-devel +BuildRequires: -db-devel +BuildRequires: libdb-4_5-devel %endif -Group: Productivity/Networking/LDAP/Servers Conflicts: openldap Requires: libldap-2_4-2 = %{version} PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep Summary: The OpenLDAP Server -%else Group: Productivity/Networking/LDAP/Clients +%else Conflicts: openldap-client Requires: libldap-2_4-2 = %{version} Summary: The OpenLDAP commandline client tools +Group: Productivity/Networking/LDAP/Clients %endif Source: openldap-%{version}.tgz Source1: openldap-rc.tgz @@ -72,8 +79,9 @@ service that has an X.500 back-end. %package -n openldap2-back-perl Summary: OpenLDAP Perl Back-End -Requires: openldap2 = %{version} perl = %{perl_version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} +Requires: perl = %{perl_version} %description -n openldap2-back-perl The OpenLDAP Perl back-end allows you to execute Perl code specific to @@ -81,8 +89,8 @@ different LDAP operations. %package -n openldap2-back-meta Summary: OpenLDAP Meta Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} Provides: openldap2:/usr/share/man/man5/slapd-meta.5.gz %description -n openldap2-back-meta @@ -93,8 +101,8 @@ Information Tree (DIT). %package -n openldap2-back-sql Summary: OpenLDAP SQL Back-End -Requires: openldap2 = %{version} Group: Productivity/Networking/LDAP/Servers +Requires: openldap2 = %{version} %description -n openldap2-back-sql The primary purpose of this OpenLDAP backend is to present information @@ -119,6 +127,7 @@ This package contains the OpenLDAP client utilities. %package -n openldap2-devel Summary: Libraries, Header Files and Documentation for OpenLDAP +Group: Development/Libraries/C and C++ # bug437293 %ifarch ppc64 Obsoletes: openldap2-devel-64bit @@ -126,11 +135,14 @@ Obsoletes: openldap2-devel-64bit # Conflicts: openldap-devel %if %suse_version >= 1110 -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel libopenssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: libopenssl-devel %else -Requires: libldap-2_4-2 = %{version} cyrus-sasl-devel openssl-devel +Requires: cyrus-sasl-devel +Requires: libldap-2_4-2 = %{version} +Requires: openssl-devel %endif -Group: Development/Libraries/C and C++ %description -n openldap2-devel This package provides the OpenLDAP libraries, header files, and