rpms/389-ds-base
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f14'

Browse Source 
Conflicts:

	.gitignore
	389-ds-base-git-local.sh
	389-ds-base-git.sh
	389-ds-base.spec
	sources
This commit is contained in:
Rich Megginson 2010-08-10 08:43:16 -06:00
commit 5143f1e89c
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
389-ds-base-1.2.6.rc6.tar.bz2
*~ *~
389-ds-base-1.2.6.rc7.tar.bz2

2
389-ds-base-git-local.sh
View File

@ -2,7 +2,7 @@
DATE=`date +%Y%m%d` DATE=`date +%Y%m%d`
# use a real tag name here # use a real tag name here
VERSION=1.2.6.rc6 VERSION=1.2.6.rc7
PKGNAME=389-ds-base PKGNAME=389-ds-base
TAG=${TAG:-$PKGNAME-$VERSION} TAG=${TAG:-$PKGNAME-$VERSION}
#SRCNAME=$PKGNAME-$VERSION-$DATE #SRCNAME=$PKGNAME-$VERSION-$DATE

2
389-ds-base-git.sh
View File

@ -2,7 +2,7 @@
DATE=`date +%Y%m%d` DATE=`date +%Y%m%d`
# use a real tag name here # use a real tag name here
VERSION=1.2.6.rc6 VERSION=1.2.6.rc7
PKGNAME=389-ds-base PKGNAME=389-ds-base
TAG=${TAG:-$PKGNAME-$VERSION} TAG=${TAG:-$PKGNAME-$VERSION}
URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz"

9
389-ds-base.spec
View File

@ -1,7 +1,7 @@
%global pkgname dirsrv %global pkgname dirsrv
# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
%global prerel .rc6 %global prerel .rc7
# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
%global relprefix 0. %global relprefix 0.
@ -10,7 +10,7 @@
Summary: 389 Directory Server (base) Summary: 389 Directory Server (base)
Name: 389-ds-base Name: 389-ds-base
Version: 1.2.6 Version: 1.2.6
Release: %{?relprefix}10%{?prerel}%{?dist} Release: %{?relprefix}11%{?prerel}%{?dist}
License: GPLv2 with exceptions License: GPLv2 with exceptions
URL: http://port389.org/ URL: http://port389.org/
Group: System Environment/Daemons Group: System Environment/Daemons
@ -346,6 +346,11 @@ end
%{_datadir}/%{pkgname}-selinux %{_datadir}/%{pkgname}-selinux
%changelog %changelog
* Tue Aug 10 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.11.rc7
- 1.2.6 release candidate 7
- git tag 389-ds-base-1.2.6.rc7
- Bug 621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6
* Mon Aug 2 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.10.rc6 * Mon Aug 2 2010 Rich Megginson <rmeggins@redhat.com> - 1.2.6-0.10.rc6
- 1.2.6 release candidate 6 - 1.2.6 release candidate 6
- git tag 389-ds-base-1.2.6.rc6 - git tag 389-ds-base-1.2.6.rc6

2
sources
View File

@ -1 +1 @@
143c4653cf8f3fd3e4cf12617deb8a0f 389-ds-base-1.2.6.rc6.tar.bz2 63598946045858e41d688b132dd279d5 389-ds-base-1.2.6.rc7.tar.bz2