[389-admin/el4/master: 16/16] Merge branch 'master' into el4

[Richard Allen Megginson]

commit 59d0b3103dae37ef022edaba64ed10a822ed4b89
Merge: 1880d5d c9f10df
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Wed Aug 4 11:34:14 2010 -0600

    Merge branch 'master' into el4
    
    Conflicts:
    
    	.gitignore
    	389-admin-git-local.sh
    	389-admin-git.sh
    	389-admin.spec
    	sources

 .gitignore             |    3 +-
 389-admin-git-local.sh |    2 +-
 389-admin-git.sh       |    2 +-
 389-admin.spec         |   50 ++++++++++++++++++++++++++++++++++++++++++-----
 sources                |    2 +-
 5 files changed, 49 insertions(+), 10 deletions(-)
---
diff --cc 389-admin.spec
index 0e00a15,fd3be8a..c6032e9
--- a/389-admin.spec
+++ b/389-admin.spec
@@@ -65,7 -83,18 +81,6 @@@ export USE_64=
  
  make %{?_smp_mflags}
  
- 
 -# Build the SELinux policy module for each variant
 -cd selinux-built
 -cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.if .
 -cp %{_datadir}/%{pkgname}-selinux/%{pkgname}.te .
 -for selinuxvariant in %{selinux_variants}
 -do
 -  make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
 -  mv %{pkgname}-admin.pp %{pkgname}-admin.pp.${selinuxvariant}
 -  make NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile clean
 -done
 -cd -
 -
  %install
  rm -rf $RPM_BUILD_ROOT 
  
@@@ -81,7 -110,16 +96,6 @@@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.l
  rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.a
  rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/modules/*.la
  
- 
 -# Install the SELinux policy
 -cd selinux-built
 -for selinuxvariant in %{selinux_variants}
 -do
 -  install -d %{buildroot}%{_datadir}/selinux/${selinuxvariant}
 -  install -p -m 644 %{pkgname}-admin.pp.${selinuxvariant} \
 -    %{buildroot}%{_datadir}/selinux/${selinuxvariant}/%{pkgname}-admin.pp
 -done
 -cd -
 -
  %clean
  rm -rf $RPM_BUILD_ROOT
  
@@@ -159,8 -216,12 +192,13 @@@ en
  %{_libdir}/%{pkgname}
  %{_mandir}/man8/*
  
 +
  %changelog
+ * Wed Aug  4 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.7.rc2
+ - 1.1.11.rc2 release
+ - git tag 389-admin-1.1.11.rc2
+ - Bug 594745 - Get rid of dirsrv_lib_t label
+ 
  * Wed Jun  9 2010 Rich Megginson <rmeggins at redhat.com> - 1.1.11-0.6.rc1
  - 1.1.11.rc1 release