packages: 389-ds-base/389-ds-base.spec - deps for rc-scripts, adapter, virt...

[glen]

Author: glen                         Date: Tue Feb 23 08:26:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- deps for rc-scripts, adapter, virtual db-devel

---- Files affected:
packages/389-ds-base:
   389-ds-base.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/389-ds-base/389-ds-base.spec
diff -u packages/389-ds-base/389-ds-base.spec:1.5 packages/389-ds-base/389-ds-base.spec:1.6
--- packages/389-ds-base/389-ds-base.spec:1.5	Mon Feb 22 09:41:17 2010
+++ packages/389-ds-base/389-ds-base.spec	Tue Feb 23 09:26:12 2010
@@ -3,7 +3,7 @@
 # - selinux_variants macro missing. something from fedora?
 #
 # Conditional build:
-%bcond_with	selinux		# build with selinu
+%bcond_with	selinux		# build with selinux
 
 %define		subver	.a1
 %define		rel		0.1
@@ -18,7 +18,7 @@
 Source0:	http://directory.fedoraproject.org/sources/%{name}-%{version}%{subver}.tar.bz2
 # Source0-md5:	aa9299aa66b09f89ed80dd0cfeebde55
 BuildRequires:	cyrus-sasl-devel
-BuildRequires:	db4.5-devel
+BuildRequires:	db-devel
 BuildRequires:	icu
 BuildRequires:	libicu-devel
 BuildRequires:	libnl-devel
@@ -26,10 +26,8 @@
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
 BuildRequires:	pcre-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	svrcore-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-# The following are needed to build the snmp ldap-agent
-BuildRequires:	net-snmp-devel
 %ifnarch sparc sparc64 ppc ppc64 s390 s390x
 BuildRequires:	lm_sensors-devel
 %endif
@@ -37,6 +35,8 @@
 BuildRequires:	openssl-devel
 BuildRequires:	tcp_wrappers
 BuildRequires:	zlib-devel
+# The following are needed to build the snmp ldap-agent
+BuildRequires:	net-snmp-devel
 # The following are needed to build the SELinux policy
 %if %{with selinux}
 BuildRequires:	checkpolicy
@@ -55,18 +55,17 @@
 Requires:	cyrus-sasl-digest-md5
 Requires:	cyrus-sasl-gssapi
 # this is needed for verify-db.pl
+Requires(post,preun):	/sbin/chkconfig
 Requires:	db-utils
-# for the init script
-Requires(post):	/sbin/chkconfig
-Requires(preun):	/sbin/chkconfig
-Requires(preun):	/sbin/service
+Requires:	rc-scripts
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 389 Directory Server is an LDAPv3 compliant server. The base package
 includes the LDAP server and command line utilities for server
 administration.
 
-%package          devel
+%package devel
 Summary:	Development libraries for 389 Directory Server
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
@@ -170,7 +169,7 @@
 /sbin/chkconfig --add dirsrv
 /sbin/chkconfig --add dirsrv-snmp
 if [ ! -e %{_localstatedir}/run/dirsrv ]; then
-	mkdir %{_localstatedir}/run/dirsrv
+	install -d %{_localstatedir}/run/dirsrv
 fi
 
 %preun
@@ -257,6 +256,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/02/23 08:26:12  glen
+- deps for rc-scripts, adapter, virtual db-devel
+
 Revision 1.5  2010/02/22 08:41:17  glen
 - nothing to ldconfig as no files in system libdir
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/389-ds-base/389-ds-base.spec?r1=1.5&r2=1.6&f=u