Merge branch 'f13' into el4

Conflicts:

	389-admin.spec

.gitignore

@@ -1,2 +1,2 @@
 *~
-/389-admin-1.1.11.tar.bz2
+389-admin-1.1.12.a2.tar.bz2

389-admin-git-local.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11
+VERSION=1.1.12.a2
 PKGNAME=389-admin
 TAG=${TAG:-$PKGNAME-$VERSION}
 SRCNAME=${PKGNAME}-${VERSION}
 echo you must be in the admin server git repo to use this
-test -d .git || {echo bye ; exit 1 }
+test -d .git || {
+echo bye ; exit 1
+}
 if [ -z "$1" ] ; then
 	dir=.
 else

389-admin-git.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%Y%m%d`
-VERSION=1.1.11
+VERSION=1.1.12.a2
 PKGNAME=389-admin
 #SRCNAME=$PKGNAME-$VERSION-$DATE
 SRCNAME=$PKGNAME-$VERSION

389-admin.spec

@@ -1,15 +1,13 @@
 %global pkgname   dirsrv
 # for a pre-release, define the prerel field - comment out for official release
-# % global prerel .rc2
+%global prerel .a2
 # also need the relprefix 0. field for a pre-release - also comment out for official release
-# % global relprefix 0.
+%global relprefix 0.
-
-%global selinux_variants mls targeted
 
 Summary:          389 Administration Server (admin)
 Name:             389-admin
-Version:          1.1.11
+Version:          1.1.12
-Release:          %{?relprefix}1%{?prerel}%{?dist}
+Release:          %{?relprefix}2%{?prerel}%{?dist}
 License:          GPLv2 and ASL 2.0
 URL:              http://port389.org/
 Group:            System Environment/Daemons
@@ -83,18 +81,6 @@ export USE_64=1
 
 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 
 
@@ -110,16 +96,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 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
 
@@ -216,30 +192,35 @@ end
 %{_libdir}/%{pkgname}
 %{_mandir}/man8/*
 
+
 %changelog
+* Tue Oct 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-0.2.a2
+- fix mozldap build breakage
+
+* Tue Sep 28 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.12-0.1.a1
+- This is the 1.1.12 alpha 1 release - with openldap support
+
 * Thu Aug 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-1
 - This is the final 1.1.11 release
 
-* Wed Aug  4 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.7.rc2
+* Wed Aug  4 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.6.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@redhat.com> - 1.1.11-0.6.rc1
+* Wed Jun  9 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.5.rc1
 - 1.1.11.rc1 release
 
-* Wed May 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.5.a4
+* Wed May 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.4.a4
 - 1.1.11.a4 release
 
-* Tue Apr  7 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.11-0.4.a3
+* Thu Apr 15 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11-0.4.a3
-- 1.1.11.a3 release
+- There is no patch2 anymore
-- Bug 570912 - dirsrv-admin SELinux module fails to install
-- Change parsing of start-slapd for instance name
-- Bug 574233 - Updated requirements for selinux policy
-- Moved selinux subpackage into base package
 
-* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> - 1.1.11.a2-0.3
+* Tue Apr  6 2010 Nathan Kinder <nkinder@redhat.com> - 1.1.11-0.3.a3
-- rebuild for icu 4.4
+- 1.1.11.a3 release
+- Change parsing of start-slapd for instance name
+- Removed selinux subpackage since EL4 has no module support
 
 * Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11.a2-0.2
 - the 1.1.11.a2 release

sources

@@ -1 +1 @@
-3301554c3cd9cb26216a43c037695559  389-admin-1.1.11.tar.bz2
+a471527e3b6920e9eb42f8b445c4c235  389-admin-1.1.12.a2.tar.bz2