Merge branch 'f13' into f14

Conflicts:

	.gitignore
	389-ds-base-git-local.sh
	389-ds-base-git.sh
	389-ds-base.spec
	sources
This commit is contained in:
Rich Megginson 2010-08-04 11:03:01 -06:00
commit 55828d826a
5 changed files with 21 additions and 6 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
389-ds-base-1.2.6.rc3.tar.bz2
389-ds-base-1.2.6.rc6.tar.bz2
*~

View File

@ -2,7 +2,7 @@
DATE=`date +%Y%m%d`
# use a real tag name here
VERSION=1.2.6.rc3
VERSION=1.2.6.rc6
PKGNAME=389-ds-base
TAG=${TAG:-$PKGNAME-$VERSION}
#SRCNAME=$PKGNAME-$VERSION-$DATE

View File

@ -2,7 +2,7 @@
DATE=`date +%Y%m%d`
# use a real tag name here
VERSION=1.2.6.rc3
VERSION=1.2.6.rc6
PKGNAME=389-ds-base
TAG=${TAG:-$PKGNAME-$VERSION}
URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"

View File

@ -1,7 +1,7 @@
%global pkgname dirsrv
# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
%global prerel .rc3
%global prerel .rc6
# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
%global relprefix 0.
@ -10,7 +10,7 @@
Summary: 389 Directory Server (base)
Name: 389-ds-base
Version: 1.2.6
Release: %{?relprefix}9%{?prerel}%{?dist}
Release: %{?relprefix}10%{?prerel}%{?dist}
License: GPLv2 with exceptions
URL: http://port389.org/
Group: System Environment/Daemons
@ -346,6 +346,20 @@ end
%{_datadir}/%{pkgname}-selinux
%changelog
* Mon Aug 2 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.10.rc6
- 1.2.6 release candidate 6
- git tag 389-ds-base-1.2.6.rc6
- Bug 617013 - repl-monitor.pl use cpu upto 90%
- Bug 616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats
- Bug 547503 - replication broken again, with 389 MMR replication and TCP errors
- Bug 613833 - Allow dirsrv_t to bind to rpc ports
- Bug 612242 - membership change on DS does not show on AD
- Bug 617629 - Missing aliases in new schema files
- Bug 619595 - Upgrading sub suffix under non-normalized suffix disappears
- Bug 616608 - SIGBUS in RDN index reads on platforms with strict alignments
- Bug 617862 - Replication: Unable to delete tombstone errors
- Bug 594745 - Get rid of dirsrv_lib_t label
* Wed Jul 14 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.9.rc3
- make selinux-devel explicit Require the base package in order
- to comply with Fedora Licensing Guidelines

View File

@ -1 +1 @@
18511d2ec2b2b7704ae12e552077d1f6 389-ds-base-1.2.6.rc3.tar.bz2
143c4653cf8f3fd3e4cf12617deb8a0f 389-ds-base-1.2.6.rc6.tar.bz2