Accepting request 141551 from home:rhafer:branches:network:ldap

bnc#767464

OBS-URL: https://build.opensuse.org/request/show/141551
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=94

openldap-rc.tgz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3dace294b063bf5077b79c0cb7173f9ad1f3b1e5423d9f0ee94f61ab3c448245
+oid sha256:c8c4eb50b6ab04db5b01e3fa1f37d537b2415d5676560a4d6b435e360f84ebac
-size 4536
+size 4765

openldap2-client.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov 16 09:52:42 UTC 2012 - rhafer@suse.com
+
+- Fixed initscript to avoid endless loop when no configuration
+  is present in /etc/openldap/slapd.d/ (bnc#767464)
+- cleaned up SLES10 buildrequires and dependencies
+- removed support for building on SLES9, didn't work anyway anymore
+- Don't buildrequire krb5-mini on Distributions where it does not
+  exist
+
 -------------------------------------------------------------------
 Fri Oct 26 12:38:46 UTC 2012 - rhafer@suse.com
 

openldap2-client.spec

@@ -26,7 +26,7 @@ BuildRequires:  cyrus-sasl-devel
 BuildRequires:  groff
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
-%if %sles_version == 9 || %sles_version == 10
+%if %sles_version == 10
 BuildRequires:  -libopenssl-devel
 BuildRequires:  -pwdutils
 BuildRequires:  openssl-devel
@@ -39,7 +39,7 @@ BuildRequires:  db-devel
 BuildRequires:  openslp-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  unixODBC-devel
-%if %sles_version == 9 || %sles_version == 10
+%if %sles_version == 10
 BuildRequires:  -db-devel
 BuildRequires:  libdb-4_5-devel
 %endif
@@ -47,8 +47,10 @@ Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
 %else
+%if 0%{?suse_version} >= 1140
 # avoid cycle with krb5
 BuildRequires:  krb5-mini
+%endif
 Conflicts:      openldap-client
 Requires:       libldap-2_4-2 = %{version}
 %endif
@@ -135,15 +137,13 @@ Obsoletes:      openldap2-devel-64bit
 %endif
 #
 Conflicts:      openldap-devel
-%if %suse_version >= 1110
+%if %sles_version == 10
-Requires:       cyrus-sasl-devel
-Requires:       libldap-2_4-2 = %{version}
-Requires:       libopenssl-devel
-%else
-Requires:       cyrus-sasl-devel
-Requires:       libldap-2_4-2 = %{version}
 Requires:       openssl-devel
+%else
+Requires:       libopenssl-devel
 %endif
+Requires:       cyrus-sasl-devel
+Requires:       libldap-2_4-2 = %{version}
 
 %description -n openldap2-devel
 This package provides the OpenLDAP libraries, header files, and

openldap2.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov 16 09:52:42 UTC 2012 - rhafer@suse.com
+
+- Fixed initscript to avoid endless loop when no configuration
+  is present in /etc/openldap/slapd.d/ (bnc#767464)
+- cleaned up SLES10 buildrequires and dependencies
+- removed support for building on SLES9, didn't work anyway anymore
+- Don't buildrequire krb5-mini on Distributions where it does not
+  exist
+
 -------------------------------------------------------------------
 Fri Oct 26 12:38:46 UTC 2012 - rhafer@suse.com
 

openldap2.spec

@@ -26,7 +26,7 @@ BuildRequires:  cyrus-sasl-devel
 BuildRequires:  groff
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
-%if %sles_version == 9 || %sles_version == 10
+%if %sles_version == 10
 BuildRequires:  -libopenssl-devel
 BuildRequires:  -pwdutils
 BuildRequires:  openssl-devel
@@ -39,7 +39,7 @@ BuildRequires:  db-devel
 BuildRequires:  openslp-devel
 BuildRequires:  tcpd-devel
 BuildRequires:  unixODBC-devel
-%if %sles_version == 9 || %sles_version == 10
+%if %sles_version == 10
 BuildRequires:  -db-devel
 BuildRequires:  libdb-4_5-devel
 %endif
@@ -47,8 +47,10 @@ Conflicts:      openldap
 Requires:       libldap-2_4-2 = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
 %else
+%if 0%{?suse_version} >= 1140
 # avoid cycle with krb5
 BuildRequires:  krb5-mini
+%endif
 Conflicts:      openldap-client
 Requires:       libldap-2_4-2 = %{version}
 %endif
@@ -135,15 +137,13 @@ Obsoletes:      openldap2-devel-64bit
 %endif
 #
 Conflicts:      openldap-devel
-%if %suse_version >= 1110
+%if %sles_version == 10
-Requires:       cyrus-sasl-devel
-Requires:       libldap-2_4-2 = %{version}
-Requires:       libopenssl-devel
-%else
-Requires:       cyrus-sasl-devel
-Requires:       libldap-2_4-2 = %{version}
 Requires:       openssl-devel
+%else
+Requires:       libopenssl-devel
 %endif
+Requires:       cyrus-sasl-devel
+Requires:       libldap-2_4-2 = %{version}
 
 %description -n openldap2-devel
 This package provides the OpenLDAP libraries, header files, and