diff --git a/.gitignore b/.gitignore index 7da61c2..09550b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *~ -/389-admin-1.1.11.tar.bz2 +389-admin-1.1.12.a1.tar.bz2 diff --git a/389-admin-git-local.sh b/389-admin-git-local.sh index 96fd6f6..2a6f449 100755 --- a/389-admin-git-local.sh +++ b/389-admin-git-local.sh @@ -1,12 +1,14 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11 +VERSION=1.1.12.a1 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 diff --git a/389-admin-git.sh b/389-admin-git.sh index a0337b9..7eafcd7 100755 --- a/389-admin-git.sh +++ b/389-admin-git.sh @@ -1,7 +1,7 @@ #!/bin/bash DATE=`date +%Y%m%d` -VERSION=1.1.11 +VERSION=1.1.12.a1 PKGNAME=389-admin #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-admin.spec b/389-admin.spec index e997154..e5159d6 100644 --- a/389-admin.spec +++ b/389-admin.spec @@ -1,14 +1,14 @@ %global pkgname dirsrv # for a pre-release, define the prerel field - comment out for official release -# % global prerel .rc2 +%global prerel .a1 # 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} License: GPLv2 and ASL 2.0 URL: http://port389.org/ @@ -20,8 +20,7 @@ Obsoletes: %{name}-selinux BuildRequires: nspr-devel BuildRequires: nss-devel -BuildRequires: svrcore-devel -BuildRequires: mozldap-devel +BuildRequires: openldap-devel BuildRequires: cyrus-sasl-devel BuildRequires: icu BuildRequires: libicu-devel @@ -72,7 +71,7 @@ and CGI utilities used by the console. %patch1 %build -%configure --disable-rpath --with-selinux +%configure --disable-rpath --with-selinux --with-openldap # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -217,6 +216,9 @@ end %{_mandir}/man8/* %changelog +* Tue Sep 28 2010 Rich Megginson - 1.1.12-0.1.a1 +- This is the 1.1.12 alpha 1 release - with openldap support + * Thu Aug 26 2010 Rich Megginson - 1.1.11-1 - This is the final 1.1.11 release diff --git a/sources b/sources index fdd0757..8d3bc36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3301554c3cd9cb26216a43c037695559 389-admin-1.1.11.tar.bz2 +63b67d24c236994e90777a90599ddb67 389-admin-1.1.12.a1.tar.bz2