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

Accepting request 138291 from openSUSE:Factory:Staging:Systemd

Browse Source 
- buildrequire krb5-mini in openldap2-client to avoid cycle

OBS-URL: https://build.opensuse.org/request/show/138291
OBS-URL: https://build.opensuse.org/package/show/network:ldap/openldap2?expand=0&rev=89
This commit is contained in:
Ralf Haferkamp 2012-10-24 14:29:21 +00:00 committed by Git OBS Bridge
parent 5b7a979021
commit 407ab6330a
5 changed files with 27 additions and 10 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 @@
-------------------------------------------------------------------
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

12
openldap2-client.spec
View File

@ -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.
# #
@ -18,8 +18,10 @@
%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

7
openldap2.changes
View File

@ -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

8
openldap2.spec
View File

@ -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

3
pre_checkin.sh
View File

@ -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."