rpms/openldap/devel openldap.spec,1.64,1.65
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Apr 23 07:45:57 UTC 2007
- Previous message (by thread): rpms/openldap/FC-6 openldap.spec,1.66,1.67
- Next message (by thread): rpms/ksh/devel ksh-20070328-leak.patch, NONE, 1.1 ksh-20070328-loginsh.patch, NONE, 1.1 ksh-20070328-uname.patch, NONE, 1.1 ksh-20070328-useex.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 ksh.spec, 1.28, 1.29 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jsafrane
Update of /cvs/dist/rpms/openldap/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28343
Modified Files:
openldap.spec
Log Message:
bind-devel removed from BuildRequires (bz#216851)
use %_localstatedir instead of var/ (bz#220970)
minor fixes in openldap.spec (rpmlint)
Index: openldap.spec
===================================================================
RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- openldap.spec 19 Feb 2007 20:44:22 -0000 1.64
+++ openldap.spec 23 Apr 2007 07:45:55 -0000 1.65
@@ -10,10 +10,10 @@
%define compat_version %{version_22}
%define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
-Summary: The configuration files, libraries, and documentation for OpenLDAP.
+Summary: The configuration files, libraries, and documentation for OpenLDAP
Name: openldap
Version: %{version_23}
-Release: 0%{?dist}
+Release: 0%{?dist}.1
License: OpenLDAP
Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -40,6 +40,7 @@
Patch6: openldap-2.3.11-nosql.patch
#Patch7: openldap-2.3.19-nostrip.patch
Patch8: openldap-2.3.19-gethostbyXXXX_r.patch
+Patch9: openldap-2.3.34-quiet-slaptest.patch
# Patches for 2.2.29 for the compat-openldap package.
Patch100: openldap-2.2.13-tls-fix-connection-test.patch
@@ -63,9 +64,9 @@
URL: http://www.openldap.org/
BuildRoot: %{_tmppath}/%{name}-%{version_23}-root
-BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
-BuildPreReq: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers-devel,
-BuildPreReq: unixODBC-devel, bind-devel, libtool-ltdl-devel
+BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel
+BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers-devel,
+BuildRequires: unixODBC-devel, libtool-ltdl-devel
Requires: glibc >= 2.2.3-48, mktemp
%description
@@ -93,7 +94,7 @@
%package servers
Summary: OpenLDAP servers and related files.
-Prereq: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
+Requires: fileutils, make, openldap = %{version_23}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser
Group: System Environment/Daemons
%description servers
@@ -107,7 +108,7 @@
%package servers-sql
Summary: OpenLDAP server SQL support module.
-Prereq: openldap-servers = %{version_23}-%{release}
+Requires: openldap-servers = %{version_23}-%{release}
Group: System Environment/Daemons
%description servers-sql
@@ -121,7 +122,7 @@
%package clients
Summary: Client programs for OpenLDAP.
-Prereq: openldap = %{version_23}-%{release}
+Requires: openldap = %{version_23}-%{release}
Group: Applications/Internet
%description clients
@@ -174,6 +175,7 @@
%patch6 -p1 -b .nosql
#%patch7 -p1 -b .nostrip
%patch8 -p1 -b .gethostbyname_r
+%patch9 -p1 -b .quiet-slaptest
cp %{_datadir}/libtool/config.{sub,guess} build/
popd
@@ -527,8 +529,8 @@
rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.a
rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so
-rm -f $RPM_BUILD_ROOT/var/openldap-data/DB_CONFIG.example
-rmdir $RPM_BUILD_ROOT/var/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data
+rm -f $RPM_BUILD_ROOT%{_localstatedir}/openldap-data/DB_CONFIG.example
+rmdir $RPM_BUILD_ROOT%{_localstatedir}/openldap-slurp $RPM_BUILD_ROOT%{_localstatedir}/openldap-data
%clean
rm -rf $RPM_BUILD_ROOT
- Previous message (by thread): rpms/openldap/FC-6 openldap.spec,1.66,1.67
- Next message (by thread): rpms/ksh/devel ksh-20070328-leak.patch, NONE, 1.1 ksh-20070328-loginsh.patch, NONE, 1.1 ksh-20070328-uname.patch, NONE, 1.1 ksh-20070328-useex.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 ksh.spec, 1.28, 1.29 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list