[openldap/f16] fix requires of main package to include %{?_isa}
jvcelak
jvcelak at fedoraproject.org
Fri Jan 6 15:37:12 UTC 2012
commit 936c398f85b1474ec271eb5f4afeb0adff1093b8
Author: Jan Vcelak <jvcelak at redhat.com>
Date: Fri Jan 6 16:04:45 2012 +0100
fix requires of main package to include %{?_isa}
openldap.spec | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index 66e50f8..a0dec3f 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -9,7 +9,7 @@
Name: openldap
Version: 2.4.26
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: LDAP support libraries
Group: System Environment/Daemons
License: OpenLDAP
@@ -69,8 +69,8 @@ libraries, and documentation for OpenLDAP.
%package devel
Summary: LDAP development libraries and header files
Group: Development/Libraries
-Requires: openldap = %{version}-%{release}, cyrus-sasl-devel >= 2.1
-Provides: openldap-evolution-devel = %{version}-%{release}
+Requires: openldap%{?_isa} = %{version}-%{release}, cyrus-sasl-devel >= 2.1
+Provides: openldap-evolution-devel%{?_isa} = %{version}-%{release}
%description devel
The openldap-devel package includes the development libraries and
@@ -83,9 +83,9 @@ customized LDAP clients.
%package servers
Summary: LDAP server
License: OpenLDAP
-Requires: openldap = %{version}-%{release}, openssl
+Requires: openldap%{?_isa} = %{version}-%{release}
Requires(pre): shadow-utils, initscripts
-Requires(post): chkconfig, /sbin/runuser, make, initscripts
+Requires(post): chkconfig, /sbin/runuser, make, initscripts, openssl
Requires(preun): chkconfig, initscripts
# BEWARE: DB 5.1 is the latest version supported by OpenLDAP 2.4.25; however we have 5.2 in Rawhide
BuildRequires: libdb-devel >= 5.0, libdb-devel < 5.3
@@ -101,7 +101,7 @@ over the Internet. This package contains the slapd server and related files.
%package servers-sql
Summary: SQL support module for OpenLDAP server
-Requires: openldap-servers = %{version}-%{release}
+Requires: openldap-servers%{?_isa} = %{version}-%{release}
Group: System Environment/Daemons
%description servers-sql
@@ -115,7 +115,7 @@ slapd server can use to read data from an RDBMS.
%package clients
Summary: LDAP client utilities
-Requires: openldap = %{version}-%{release}
+Requires: openldap%{?_isa} = %{version}-%{release}
Group: Applications/Internet
%description clients
@@ -679,6 +679,9 @@ exit 0
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Fri Jan 06 2012 Jan Vcelak <jvcelak at redhat.com> 2.4.26-6
+- fix requires of main package to include %{?_isa}
+
* Thu Oct 06 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.26-5
- rebuild: openldap does not work after libdb rebase (#743824)
- regression fix: openldap built without tcp_wrappers (#743213)
More information about the scm-commits
mailing list