[389-ds-base/el4/master: 2/2] Merge branch 'master' into el4

[Richard Allen Megginson]

commit f4baa64a2193bc4e7fe19719402106a227775ffc
Merge: 84b5e91 d5673eb
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Thu Sep 23 14:31:34 2010 -0600

    Merge branch 'master' into el4

 .gitignore               |    2 +-
 389-ds-base-devel.README |    1 -
 389-ds-base-git-local.sh |    2 +-
 389-ds-base-git.sh       |    2 +-
 389-ds-base.spec         |    5 ++++-
 sources                  |    2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)
---
diff --cc 389-ds-base.spec
index 67074e4,5727d1d..eefd765
--- a/389-ds-base.spec
+++ b/389-ds-base.spec
@@@ -7,9 -7,11 +7,9 @@@
  # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
  #% global relprefix 0.
  
 -%global selinux_variants mls targeted
 -
  Summary:          389 Directory Server (base)
  Name:             389-ds-base
- Version:          1.2.6
+ Version:          1.2.6.1
  Release:          %{?relprefix}1%{?prerel}%{?dist}
  License:          GPLv2 with exceptions
  URL:              http://port389.org/
@@@ -253,7 -343,14 +253,10 @@@ f
  %{_includedir}/%{pkgname}
  %{_libdir}/%{pkgname}/*.so
  
 -%files selinux-devel
 -%defattr(-,root,root,-)
 -%{_datadir}/%{pkgname}-selinux
 -
  %changelog
+ * Thu Sep 23 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6.1-1
+ - Bug 634561 - Server crushes when using Windows Sync Agreement
+ 
  * Thu Aug 26 2010 Rich Megginson <rmeggins at redhat.com> - 1.2.6-1
  - This is the final 1.2.6 release