From ad9153608a93f31b26571a8954537185700a77a7 Mon Sep 17 00:00:00 2001 From: Richard Allen Megginson Date: Dec 02 2009 18:17:03 +0000 Subject: this is the 1.2.5.rc1 release --- diff --git a/.cvsignore b/.cvsignore index de018c1..4dc6fde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -389-ds-base-1.2.3.tar.bz2 -389-ds-base-1.2.4.tar.bz2 +389-ds-base-1.2.5.rc1.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index b246dd4..7ab243b 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,9 +2,9 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.4 +VERSION=1.2.5.rc1 PKGNAME=389-ds-base -TAG=$PKGNAME-$VERSION +TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE SRCNAME=$PKGNAME-$VERSION diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 262f2a2..2320468 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,15 +2,15 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.4 +VERSION=1.2.5.rc1 PKGNAME=389-ds-base -TAG=$PKGNAME-$VERSION -#export CVSROOT=:pserver:anonymous@cvs.fedoraproject.org:/cvs/dirsec -#SRCNAME=$PKGNAME-$VERSION-$DATE +TAG=${TAG:-$PKGNAME-$VERSION} +URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" SRCNAME=$PKGNAME-$VERSION -cvs -d "$CVSROOT" -z3 export -r$CVSTAG -d $SRCNAME ldapserver +wget -O $SRCNAME.tar.gz "$URL" -tar -cjf $SRCNAME.tar.bz2 $SRCNAME +echo convert tgz format to tar.bz2 format -rm -rf $SRCNAME +gunzip $PKGNAME-$VERSION.tar.gz +bzip2 $PKGNAME-$VERSION.tar diff --git a/389-ds-base.spec b/389-ds-base.spec index e24dbd9..b8e6da3 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,10 +1,14 @@ -%define pkgname dirsrv +%global pkgname dirsrv +# for a pre-release, define the prerel field - comment out for official release +%global prerel .rc1 +# also need the relprefix field for a pre-release - also comment out for official release +%global relprefix 0. Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.2.4 -Release: 1%{?dist} +Version: 1.2.5 +Release: %{?relprefix}2%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons @@ -61,7 +65,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service -Source0: http://port389.org/sources/%{name}-%{version}.tar.bz2 +Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz2 # 389-ds-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh Source2: %{name}-devel.README @@ -82,7 +86,7 @@ Obsoletes: fedora-ds-base-devel < 1.2.1-1 Development Libraries and headers for the 389 Directory Server base package. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{version}%{?prerel} cp %{SOURCE2} README.devel %build @@ -265,6 +269,12 @@ end %{_libdir}/%{pkgname}/*.so %changelog +* Wed Dec 2 2009 Rich Megginson - 1.2.5-0.2.rc1 +- 1.2.5.rc1 release + +* Thu Nov 12 2009 Rich Megginson - 1.2.5-0.1.a1 +- 1.2.5.a1 release + * Thu Oct 29 2009 Rich Megginson - 1.2.4-1 - 1.2.4 release - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration diff --git a/sources b/sources index ec512f0..56b7f5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fbb224f4926ca98fc54794700bb89497 389-ds-base-1.2.4.tar.bz2 +96a177fb2b58124073041896c0fd0555 389-ds-base-1.2.5.rc1.tar.bz2