rpms/389-ds-base/F-11 .cvsignore, 1.5, 1.6 389-ds-base-git-local.sh, 1.2, 1.3 389-ds-base-git.sh, 1.3, 1.4 389-ds-base.spec, 1.7, 1.8 sources, 1.7, 1.8

[Richard Allen Megginson]

Author: rmeggins

Update of /cvs/extras/rpms/389-ds-base/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14093/F-11

Modified Files:
	.cvsignore 389-ds-base-git-local.sh 389-ds-base-git.sh 
	389-ds-base.spec sources 
Log Message:
this is the 1.2.5.rc1 release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	29 Oct 2009 17:59:59 -0000	1.5
+++ .cvsignore	2 Dec 2009 18:17:03 -0000	1.6
@@ -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


Index: 389-ds-base-git-local.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git-local.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- 389-ds-base-git-local.sh	29 Oct 2009 18:00:00 -0000	1.2
+++ 389-ds-base-git-local.sh	2 Dec 2009 18:17:03 -0000	1.3
@@ -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
 


Index: 389-ds-base-git.sh
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base-git.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- 389-ds-base-git.sh	29 Oct 2009 18:00:00 -0000	1.3
+++ 389-ds-base-git.sh	2 Dec 2009 18:17:03 -0000	1.4
@@ -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 at 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


Index: 389-ds-base.spec
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/389-ds-base.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- 389-ds-base.spec	29 Oct 2009 18:00:00 -0000	1.7
+++ 389-ds-base.spec	2 Dec 2009 18:17:03 -0000	1.8
@@ -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 <
 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 <rmeggins at redhat.com> - 1.2.5-0.2.rc1
+- 1.2.5.rc1 release
+
+* Thu Nov 12 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.5-0.1.a1
+- 1.2.5.a1 release
+
 * Thu Oct 29 2009 Rich Megginson <rmeggins at redhat.com> - 1.2.4-1
 - 1.2.4 release
 - resolves bug 221905 - added support for Salted MD5 (SMD5) passwords - primarily for migration


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/389-ds-base/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Oct 2009 22:51:23 -0000	1.7
+++ sources	2 Dec 2009 18:17:03 -0000	1.8
@@ -1 +1 @@
-fbb224f4926ca98fc54794700bb89497  389-ds-base-1.2.4.tar.bz2
+96a177fb2b58124073041896c0fd0555  389-ds-base-1.2.5.rc1.tar.bz2