diff --git a/.gitignore b/.gitignore index 17c623a..a28729b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *~ -389-ds-base-1.2.6.1.tar.bz2 +389-ds-base-1.2.7.a2.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 4ac678a..e92d078 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.1 +VERSION=1.2.7.a2 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index c80f158..a0136b0 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.6.1 +VERSION=1.2.7.a2 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index ce4b75d..b6019ba 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -3,15 +3,17 @@ # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release # also remove the space between % and global - this space is needed because # fedpkg verrel stupidly ignores comment lines -#% global prerel .rc7 +%global prerel .a2 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release -#% global relprefix 0. +%global relprefix 0. %global selinux_variants mls targeted +# only F-14 and later use openldap +# % global use_openldap 1 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.2.6.1 +Version: 1.2.7 Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ @@ -24,7 +26,11 @@ Obsoletes: %{name}-selinux BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: svrcore-devel +%if %{use_openldap} +BuildRequires: openldap-devel +%else BuildRequires: mozldap-devel +%endif BuildRequires: db4-devel BuildRequires: cyrus-sasl-devel BuildRequires: icu @@ -56,7 +62,12 @@ Requires(preun): policycoreutils Requires(postun): policycoreutils # the following are needed for some of our scripts +%if %{use_openldap} +Requires: openldap-clients +%else Requires: mozldap-tools +%endif +# use_openldap assumes perl-Mozilla-LDAP is built with openldap support Requires: perl-Mozilla-LDAP # this is needed to setup SSL if you are not using the @@ -95,7 +106,11 @@ the LDAP server and command line utilities for server administration. Summary: Development libraries for 389 Directory Server Group: Development/Libraries Requires: %{name} = %{version}-%{release} +%if %{use_openldap} +Requires: openldap-devel +%else Requires: mozldap-devel +%endif Provides: fedora-ds-base-devel = %{version}-%{release} Obsoletes: fedora-ds-base-devel < 1.2.1-1 @@ -105,7 +120,6 @@ Development Libraries and headers for the 389 Directory Server base package. %package selinux-devel Summary: Development interface for 389 Directory Server base SELinux policy Group: Development/Libraries -Requires: %{name} = %{version}-%{release} %description selinux-devel SELinux policy interface for the 389 Directory Server base package. @@ -115,7 +129,10 @@ SELinux policy interface for the 389 Directory Server base package. cp %{SOURCE2} README.devel %build -%configure --enable-autobind --with-selinux +%if %{use_openldap} +OPENLDAP_FLAG="--with-openldap" +%endif +%configure --enable-autobind --with-selinux $OPENLDAP_FLAG # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -348,8 +365,19 @@ end %{_datadir}/%{pkgname}-selinux %changelog -* Wed Sep 29 2010 Rich Megginson - 1.2.6.1-2 -- bump rev to rebuild +* Tue Oct 19 2010 Rich Megginson - 1.2.7-0.2.a2 +- 1.2.7.a2 release - a1 was the OpenLDAP testday release +- git tag 389-ds-base-1.2.7.a2 +- added openldap support on platforms that use openldap with moznss +- for crypto (F-14 and later) +- many bug fixes +- Account Policy Plugin (keep track of last login, disable old accounts) + +* Fri Oct 8 2010 Rich Megginson - 1.2.7-0.1.a1 +- added openldap support + +* Mon Sep 27 2010 Rich Megginson - 1.2.6.1-2 +- bump rel to rebuild * Thu Sep 23 2010 Rich Megginson - 1.2.6.1-1 - This is the 1.2.6.1 release - git tag 389-ds-base-1.2.6.1 @@ -358,6 +386,15 @@ end - Bug 612264 - ACI issue with (targetattr='userPassword') - Bug 606920 - anonymous resource limit- nstimelimit - also applied to "cn=directory manager" - Bug 631862 - crash - delete entries not in cache + referint +<<<<<<< HEAD:389-ds-base.spec +======= +<<<<<<< HEAD:389-ds-base.spec +======= + +* Wed Sep 22 2010 Rich Megginson - 1.2.6-2 +- put back some of the selinux requires that I nuked during a git merge :P +>>>>>>> f13:389-ds-base.spec +>>>>>>> f12:389-ds-base.spec * Thu Aug 26 2010 Rich Megginson - 1.2.6-1 - This is the final 1.2.6 release @@ -425,7 +462,7 @@ end - add support for matching rules - many bug fixes -* Thu Jan 14 2010 Nathan Kinder - 1.2.6-0.1.a1 +* Fri Jan 15 2010 Nathan Kinder - 1.2.6-0.1.a1 - 1.2.6.a1 release - Added SELinux policy and subpackages @@ -438,15 +475,6 @@ end * Mon Dec 17 2009 Rich Megginson - 1.2.5-0.4.rc3 - 1.2.5.rc3 release -* Mon Dec 7 2009 Rich Megginson - 1.2.5-0.3.rc2 -- 1.2.5.rc2 release - -* Wed Dec 2 2009 Rich Megginson - 1.2.5-0.2.rc1 -- 1.2.5.rc1 release - -* Thu Nov 12 2009 Rich Megginson - 1.2.5-0.1.a1 -- 1.2.5.a1 release - * Thu Oct 29 2009 Rich Megginson - 1.2.4-1 - 1.2.4 release - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration diff --git a/sources b/sources index cc5be35..62cfc11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a08e48391a3aa45e110f810d8b62b9bd 389-ds-base-1.2.6.1.tar.bz2 +7401d018c7829abd9100e35162eab8c4 389-ds-base-1.2.7.a2.tar.bz2