Merge branch 'f13' into el6

This commit is contained in:
Rich Megginson 2010-10-26 13:22:07 -06:00
commit f6c846bf55
5 changed files with 17 additions and 12 deletions

2
.gitignore vendored
View file

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

View file

@ -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

View file

@ -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

View file

@ -1,15 +1,15 @@
%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
Release: %{?relprefix}1%{?prerel}%{?dist}
Version: 1.1.12
Release: %{?relprefix}2%{?prerel}%{?dist}
License: GPLv2 and ASL 2.0
URL: http://port389.org/
Group: System Environment/Daemons
@ -217,6 +217,12 @@ end
%{_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
@ -238,9 +244,6 @@ end
- 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
- rebuild for icu 4.4
* Fri Feb 26 2010 Rich Megginson <rmeggins@redhat.com> - 1.1.11.a2-0.2
- the 1.1.11.a2 release
- Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location

View file

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