forked from pool/openldap2
Accepting request 139176 from network:ldap
- buildrequire krb5-mini in openldap2-client to avoid cycle (forwarded request 138291 from coolo) OBS-URL: https://build.opensuse.org/request/show/139176 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=90
This commit is contained in:
commit
5c999b158b
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 16 07:38:01 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
- buildrequire krb5-mini in openldap2-client to avoid cycle
|
||||||
|
- move Summary out of the %if as prepare_spec is confused about
|
||||||
|
the license otherwise
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 10 09:22:52 UTC 2012 - rhafer@suse.de
|
Thu May 10 09:22:52 UTC 2012 - rhafer@suse.de
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package openldap2
|
# spec file for package openldap2-client
|
||||||
#
|
#
|
||||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -19,7 +19,9 @@
|
|||||||
%define run_test_suite 0
|
%define run_test_suite 0
|
||||||
|
|
||||||
Name: openldap2-client
|
Name: openldap2-client
|
||||||
|
Summary: The OpenLDAP commandline client tools
|
||||||
License: OLDAP-2.8
|
License: OLDAP-2.8
|
||||||
|
Group: Productivity/Networking/LDAP/Clients
|
||||||
BuildRequires: cyrus-sasl-devel
|
BuildRequires: cyrus-sasl-devel
|
||||||
BuildRequires: libopenssl-devel
|
BuildRequires: libopenssl-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -43,13 +45,11 @@ BuildRequires: libdb-4_5-devel
|
|||||||
Conflicts: openldap
|
Conflicts: openldap
|
||||||
Requires: libldap-2_4-2 = %{version}
|
Requires: libldap-2_4-2 = %{version}
|
||||||
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
|
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
|
||||||
Summary: The OpenLDAP Server
|
|
||||||
Group: Productivity/Networking/LDAP/Clients
|
|
||||||
%else
|
%else
|
||||||
|
# avoid cycle with krb5
|
||||||
|
BuildRequires: krb5-mini
|
||||||
Conflicts: openldap-client
|
Conflicts: openldap-client
|
||||||
Requires: libldap-2_4-2 = %{version}
|
Requires: libldap-2_4-2 = %{version}
|
||||||
Summary: The OpenLDAP commandline client tools
|
|
||||||
Group: Productivity/Networking/LDAP/Clients
|
|
||||||
%endif
|
%endif
|
||||||
Source: openldap-%{version}.tgz
|
Source: openldap-%{version}.tgz
|
||||||
Source1: openldap-rc.tgz
|
Source1: openldap-rc.tgz
|
||||||
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 16 07:38:01 UTC 2012 - coolo@suse.com
|
||||||
|
|
||||||
|
- buildrequire krb5-mini in openldap2-client to avoid cycle
|
||||||
|
- move Summary out of the %if as prepare_spec is confused about
|
||||||
|
the license otherwise
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu May 10 09:22:52 UTC 2012 - rhafer@suse.de
|
Thu May 10 09:22:52 UTC 2012 - rhafer@suse.de
|
||||||
|
|
||||||
|
@ -19,7 +19,9 @@
|
|||||||
%define run_test_suite 0
|
%define run_test_suite 0
|
||||||
|
|
||||||
Name: openldap2
|
Name: openldap2
|
||||||
|
Summary: The OpenLDAP Server
|
||||||
License: OLDAP-2.8
|
License: OLDAP-2.8
|
||||||
|
Group: Productivity/Networking/LDAP/Clients
|
||||||
BuildRequires: cyrus-sasl-devel
|
BuildRequires: cyrus-sasl-devel
|
||||||
BuildRequires: libopenssl-devel
|
BuildRequires: libopenssl-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -43,13 +45,11 @@ BuildRequires: libdb-4_5-devel
|
|||||||
Conflicts: openldap
|
Conflicts: openldap
|
||||||
Requires: libldap-2_4-2 = %{version}
|
Requires: libldap-2_4-2 = %{version}
|
||||||
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
|
PreReq: %insserv_prereq %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd /usr/bin/grep
|
||||||
Summary: The OpenLDAP Server
|
|
||||||
Group: Productivity/Networking/LDAP/Clients
|
|
||||||
%else
|
%else
|
||||||
|
# avoid cycle with krb5
|
||||||
|
BuildRequires: krb5-mini
|
||||||
Conflicts: openldap-client
|
Conflicts: openldap-client
|
||||||
Requires: libldap-2_4-2 = %{version}
|
Requires: libldap-2_4-2 = %{version}
|
||||||
Summary: The OpenLDAP commandline client tools
|
|
||||||
Group: Productivity/Networking/LDAP/Clients
|
|
||||||
%endif
|
%endif
|
||||||
Source: openldap-%{version}.tgz
|
Source: openldap-%{version}.tgz
|
||||||
Source1: openldap-rc.tgz
|
Source1: openldap-rc.tgz
|
||||||
|
@ -6,6 +6,9 @@ cp openldap2.changes openldap2-client.changes
|
|||||||
cp openldap2.spec openldap2-client.spec
|
cp openldap2.spec openldap2-client.spec
|
||||||
|
|
||||||
perl -pi -e "s/^Name:.*openldap2$/Name: openldap2-client/g" openldap2-client.spec
|
perl -pi -e "s/^Name:.*openldap2$/Name: openldap2-client/g" openldap2-client.spec
|
||||||
|
perl -pi -e "s/^Summary:.*Server$/Summary: The OpenLDAP commandline client tools/" openldap2-client.spec
|
||||||
|
|
||||||
|
osc service localrun format_spec_file
|
||||||
|
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user