pool/openldap2
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 266309 from network:ldap

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/266309
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=109
This commit is contained in:
Dominique Leuenberger 2015-01-20 20:53:35 +00:00 committed by Git OBS Bridge
commit 294757789e
4 changed files with 70 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openldap2-client.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 26 11:21:34 UTC 2014 - jengelh@inai.de
- binutils is required for "strings" utility invocation in %pre
[bnc#904028]
- Remove SLE10 definitions
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 12 11:48:00 UTC 2014 - jengelh@inai.de Sun Oct 12 11:48:00 UTC 2014 - jengelh@inai.de

66
openldap2-client.spec
View File

@ -27,40 +27,9 @@ Name: openldap2-client
Summary: The OpenLDAP commandline client tools Summary: The OpenLDAP commandline client tools
License: OLDAP-2.8 License: OLDAP-2.8
Group: Productivity/Networking/LDAP/Clients Group: Productivity/Networking/LDAP/Clients
BuildRequires: cyrus-sasl-devel
BuildRequires: groff
BuildRequires: libopenssl-devel
BuildRequires: libtool
%if %sles_version == 10
BuildRequires: -libopenssl-devel
BuildRequires: -pwdutils
BuildRequires: openssl-devel
%endif
Version: 2.4.39 Version: 2.4.39
Release: 0 Release: 0
Url: http://www.openldap.org Url: http://www.openldap.org
%if "%{name}" == "openldap2"
BuildRequires: libdb-4_8-devel
BuildRequires: openslp-devel
BuildRequires: tcpd-devel
BuildRequires: unixODBC-devel
%if %sles_version == 10
BuildRequires: -libdb-4_8-devel
BuildRequires: libdb-4_5-devel
%endif
Conflicts: openldap
Requires: libldap-2_4-2 = %{version_main}
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
%if 0%{?suse_version} >= 1140
# avoid cycle with krb5
BuildRequires: krb5-mini
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif
%else
Conflicts: openldap-client
Requires: libldap-2_4-2 = %{version_main}
%endif
Source: openldap-%{version_main}.tgz Source: openldap-%{version_main}.tgz
Source1: openldap-rc.tgz Source1: openldap-rc.tgz
Source2: addonschema.tar.gz Source2: addonschema.tar.gz
@ -91,6 +60,31 @@ Patch108: openldap-2.3.37-libldap-ld_defconn-ldap_free_connection.dif
Patch109: openldap-2.3.37-libldap-tls_chkhost-its6239.dif Patch109: openldap-2.3.37-libldap-tls_chkhost-its6239.dif
Patch110: openldap-2.3.37-libldap-ssl.dif Patch110: openldap-2.3.37-libldap-ssl.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cyrus-sasl-devel
BuildRequires: groff
BuildRequires: libopenssl-devel
BuildRequires: libtool
%if "%{name}" == "openldap2"
BuildRequires: db-devel
BuildRequires: openslp-devel
BuildRequires: tcpd-devel
BuildRequires: unixODBC-devel
Conflicts: openldap
Requires: libldap-2_4-2 = %{version_main}
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
%if 0%{?suse_version} >= 1140
# avoid cycle with krb5
BuildRequires: krb5-mini
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif
%else
Conflicts: openldap-client
Requires: libldap-2_4-2 = %{version_main}
%endif
# For /usr/bin/strings
Requires(pre): binutils
%if "%{name}" == "openldap2" %if "%{name}" == "openldap2"
%description %description
@ -187,13 +181,9 @@ documentation.
Summary: Static libraries for the OpenLDAP libraries Summary: Static libraries for the OpenLDAP libraries
License: OLDAP-2.8 License: OLDAP-2.8
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: openldap2-devel = %version
%if %sles_version == 10
Requires: openssl-devel
%else
Requires: libopenssl-devel
%endif
Requires: cyrus-sasl-devel Requires: cyrus-sasl-devel
Requires: libopenssl-devel
Requires: openldap2-devel = %version
%description -n openldap2-devel-static %description -n openldap2-devel-static
This package provides the static versions of the OpenLDAP libraries This package provides the static versions of the OpenLDAP libraries
@ -381,7 +371,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcslapd
# install 2.3 slapcat # install 2.3 slapcat
install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat
%endif %endif
# install sle-10 compat libraries echo "install sle-10 compat libraries (for SLE11)"
pushd ../openldap-2.3.37/libraries pushd ../openldap-2.3.37/libraries
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
popd popd

7
openldap2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 26 11:21:34 UTC 2014 - jengelh@inai.de
- binutils is required for "strings" utility invocation in %pre
[bnc#904028]
- Remove SLE10 definitions
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 12 11:48:00 UTC 2014 - jengelh@inai.de Sun Oct 12 11:48:00 UTC 2014 - jengelh@inai.de

66
openldap2.spec
View File

@ -27,40 +27,9 @@ Name: openldap2
Summary: The OpenLDAP Server Summary: The OpenLDAP Server
License: OLDAP-2.8 License: OLDAP-2.8
Group: Productivity/Networking/LDAP/Clients Group: Productivity/Networking/LDAP/Clients
BuildRequires: cyrus-sasl-devel
BuildRequires: groff
BuildRequires: libopenssl-devel
BuildRequires: libtool
%if %sles_version == 10
BuildRequires: -libopenssl-devel
BuildRequires: -pwdutils
BuildRequires: openssl-devel
%endif
Version: 2.4.39 Version: 2.4.39
Release: 0 Release: 0
Url: http://www.openldap.org Url: http://www.openldap.org
%if "%{name}" == "openldap2"
BuildRequires: libdb-4_8-devel
BuildRequires: openslp-devel
BuildRequires: tcpd-devel
BuildRequires: unixODBC-devel
%if %sles_version == 10
BuildRequires: -libdb-4_8-devel
BuildRequires: libdb-4_5-devel
%endif
Conflicts: openldap
Requires: libldap-2_4-2 = %{version_main}
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
%if 0%{?suse_version} >= 1140
# avoid cycle with krb5
BuildRequires: krb5-mini
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif
%else
Conflicts: openldap-client
Requires: libldap-2_4-2 = %{version_main}
%endif
Source: openldap-%{version_main}.tgz Source: openldap-%{version_main}.tgz
Source1: openldap-rc.tgz Source1: openldap-rc.tgz
Source2: addonschema.tar.gz Source2: addonschema.tar.gz
@ -91,6 +60,31 @@ Patch108: openldap-2.3.37-libldap-ld_defconn-ldap_free_connection.dif
Patch109: openldap-2.3.37-libldap-tls_chkhost-its6239.dif Patch109: openldap-2.3.37-libldap-tls_chkhost-its6239.dif
Patch110: openldap-2.3.37-libldap-ssl.dif Patch110: openldap-2.3.37-libldap-ssl.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cyrus-sasl-devel
BuildRequires: groff
BuildRequires: libopenssl-devel
BuildRequires: libtool
%if "%{name}" == "openldap2"
BuildRequires: db-devel
BuildRequires: openslp-devel
BuildRequires: tcpd-devel
BuildRequires: unixODBC-devel
Conflicts: openldap
Requires: libldap-2_4-2 = %{version_main}
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
%if 0%{?suse_version} >= 1140
# avoid cycle with krb5
BuildRequires: krb5-mini
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif
%else
Conflicts: openldap-client
Requires: libldap-2_4-2 = %{version_main}
%endif
# For /usr/bin/strings
Requires(pre): binutils
%if "%{name}" == "openldap2" %if "%{name}" == "openldap2"
%description %description
@ -187,13 +181,9 @@ documentation.
Summary: Static libraries for the OpenLDAP libraries Summary: Static libraries for the OpenLDAP libraries
License: OLDAP-2.8 License: OLDAP-2.8
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: openldap2-devel = %version
%if %sles_version == 10
Requires: openssl-devel
%else
Requires: libopenssl-devel
%endif
Requires: cyrus-sasl-devel Requires: cyrus-sasl-devel
Requires: libopenssl-devel
Requires: openldap2-devel = %version
%description -n openldap2-devel-static %description -n openldap2-devel-static
This package provides the static versions of the OpenLDAP libraries This package provides the static versions of the OpenLDAP libraries
@ -381,7 +371,7 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcslapd
# install 2.3 slapcat # install 2.3 slapcat
install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat install -m 755 ../openldap-2.3.37/servers/slapd/slapcat $RPM_BUILD_ROOT/usr/sbin/openldap-2.3-slapcat
%endif %endif
# install sle-10 compat libraries echo "install sle-10 compat libraries (for SLE11)"
pushd ../openldap-2.3.37/libraries pushd ../openldap-2.3.37/libraries
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
popd popd