rpms/fedora-ds-base/FC-6 .cvsignore, 1.4, 1.5 fedora-ds-base-cvs.sh, 1.2, 1.3 fedora-ds-base.spec, 1.3, 1.4 sources, 1.4, 1.5 install.inf, 1.2, NONE
Richard Allen Megginson (rmeggins)
fedora-extras-commits at redhat.com
Fri Jul 20 21:56:02 UTC 2007
- Previous message (by thread): rpms/fedora-ds-base/FC-5 .cvsignore, 1.4, 1.5 fedora-ds-base-cvs.sh, 1.2, 1.3 fedora-ds-base.spec, 1.3, 1.4 sources, 1.4, 1.5 install.inf, 1.2, NONE
- Next message (by thread): rpms/fedora-ds-base/devel .cvsignore, 1.5, 1.6 fedora-ds-base-cvs.sh, 1.2, 1.3 fedora-ds-base.spec, 1.3, 1.4 sources, 1.5, 1.6 install.inf, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rmeggins
Update of /cvs/extras/rpms/fedora-ds-base/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20930/FC-6
Modified Files:
.cvsignore fedora-ds-base-cvs.sh fedora-ds-base.spec sources
Removed Files:
install.inf
Log Message:
update to 1.1.0 alpha 4
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 20 Mar 2007 20:12:10 -0000 1.4
+++ .cvsignore 20 Jul 2007 21:55:30 -0000 1.5
@@ -1 +1,2 @@
fedora-ds-base-1.1.0-20070320.tar.bz2
+fedora-ds-base-1.1.0-20070720.tar.bz2
Index: fedora-ds-base-cvs.sh
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base-cvs.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-ds-base-cvs.sh 20 Mar 2007 20:12:10 -0000 1.2
+++ fedora-ds-base-cvs.sh 20 Jul 2007 21:55:30 -0000 1.3
@@ -1,7 +1,7 @@
#!/bin/bash
DATE=`date +%Y%m%d`
-CVSTAG=FedoraDirSvr110a3
+CVSTAG=FedoraDirSvr110a4
VERSION=1.1.0
PKGNAME=fedora-ds-base
export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/dirsec
Index: fedora-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/fedora-ds-base.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-ds-base.spec 18 Jun 2007 21:56:04 -0000 1.3
+++ fedora-ds-base.spec 20 Jul 2007 21:55:30 -0000 1.4
@@ -1,12 +1,12 @@
# cvsdate should correspond to the cvsdate in the fedora-ds-cvs.sh script
-%{!?cvsdate:%define cvsdate 20070320}
+%{!?cvsdate:%define cvsdate 20070720}
%define shortname fedora-ds
Summary: Fedora Directory Server (base)
Name: fedora-ds-base
Version: 1.1.0
-Release: 0.2.%{?cvsdate}%{?dist}
+Release: 0.3.%{?cvsdate}%{?dist}
License: GPL plus extensions
URL: http://directory.fedora.redhat.com/
Group: System Environment/Daemons
@@ -33,8 +33,14 @@
# the following is for the pam passthru auth plug-in
BuildRequires: pam-devel
-# the following is needed for some of our scripts
+# the following are needed for some of our scripts
Requires: mozldap-tools >= 6.0.2
+Requires: perl-Mozilla-LDAP
+
+# these are not found by the auto-dependency method
+# they are required to support the mandatory LDAP SASL mechs
+Requires: cyrus-sasl-gssapi
+Requires: cyrus-sasl-md5
# for the init script
Requires(post): /sbin/chkconfig
@@ -44,8 +50,7 @@
Source0: %{name}-%{version}-%{cvsdate}.tar.bz2
# fedora-ds-cvs.sh should be used to generate the source tarball from CVS
Source1: %{name}-cvs.sh
-Source2: install.inf
-Source3: %{name}-devel.README
+Source2: %{name}-devel.README
%description
Fedora Directory Server is an LDAPv3 compliant server. The base package includes
@@ -62,8 +67,7 @@
%prep
%setup -q -n %{name}-%{version}-%{cvsdate}
-cp %{SOURCE2} install.inf
-cp %{SOURCE3} README.devel
+cp %{SOURCE2} README.devel
%build
%configure
@@ -98,7 +102,6 @@
# make sure perl scripts have a proper shebang
sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{shortname}/script-templates/template-*.pl
-sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{shortname}/script-templates/template-migrate*
%clean
rm -rf $RPM_BUILD_ROOT
@@ -118,21 +121,20 @@
%files
%defattr(-,root,root,-)
-%doc LICENSE EXCEPTION install.inf
+%doc LICENSE EXCEPTION
%dir %{_sysconfdir}/%{shortname}
%dir %{_sysconfdir}/%{shortname}/schema
%config(noreplace)%{_sysconfdir}/%{shortname}/schema/*.ldif
-%dir %{_sysconfdir}/%{shortname}/property
-%config(noreplace)%{_sysconfdir}/%{shortname}/property/ns-slapd.properties
%dir %{_sysconfdir}/%{shortname}/config
%config(noreplace)%{_sysconfdir}/%{shortname}/config/slapd-collations.conf
%config(noreplace)%{_sysconfdir}/%{shortname}/config/certmap.conf
%{_datadir}/%{shortname}
%{_initrddir}/%{shortname}
%{_bindir}/*
-%{_sbindir}/ns-slapd
+%{_sbindir}/*
%dir %{_libdir}/%{shortname}
%{_libdir}/%{shortname}/*.so.*
+%{_libdir}/%{shortname}/perl
%dir %{_libdir}/%{shortname}/plugins
%{_libdir}/%{shortname}/plugins/*.so
%dir %{_localstatedir}/lib/%{shortname}
@@ -147,6 +149,12 @@
%{_libdir}/%{shortname}/*.so
%changelog
+* Fri Jul 20 2007 Rich Megginson <rmeggins at redhat.com> - 1.1.0-0.3.20070720
+- Added Requires for perldap, cyrus sasl plugins
+- Removed template-migrate* files
+- Added perl module directory
+- Removed install.inf - setup-ds.pl can now easily generate one
+
* Mon Jun 18 2007 Nathan Kinder <nkinder at redhat.com> - 1.1.0-0.2.20070320
- added requires for mozldap-tools
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-ds-base/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 20 Mar 2007 20:12:10 -0000 1.4
+++ sources 20 Jul 2007 21:55:30 -0000 1.5
@@ -1 +1,2 @@
0680a1fa973a2edee3eb8f1a2fa11e3e fedora-ds-base-1.1.0-20070320.tar.bz2
+ab21111ffeed1f481f946c6a6c8f315b fedora-ds-base-1.1.0-20070720.tar.bz2
--- install.inf DELETED ---
- Previous message (by thread): rpms/fedora-ds-base/FC-5 .cvsignore, 1.4, 1.5 fedora-ds-base-cvs.sh, 1.2, 1.3 fedora-ds-base.spec, 1.3, 1.4 sources, 1.4, 1.5 install.inf, 1.2, NONE
- Next message (by thread): rpms/fedora-ds-base/devel .cvsignore, 1.5, 1.6 fedora-ds-base-cvs.sh, 1.2, 1.3 fedora-ds-base.spec, 1.3, 1.4 sources, 1.5, 1.6 install.inf, 1.2, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list