From 4076f8509b26e720ea9b9f974c14cf41ea6c233a Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Oct 05 2013 01:22:31 +0000 Subject: rebase to 1.2.11.24 --- diff --git a/.gitignore b/.gitignore index 48b2e2d..e784dd5 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /389-ds-base-1.2.10.12.tar.bz2 /389-ds-base-1.2.10.13.tar.bz2 /389-ds-base-1.2.10.14.tar.bz2 +/389-ds-base-1.2.11.24.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 30b95d5..5f63ffa 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.10.14 +VERSION=1.2.11.24 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index d4387c4..a6d0a6c 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.10.14 +VERSION=1.2.11.24 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 44c64bb..03d9c34 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -1,47 +1,33 @@ -%global pkgname dirsrv +%define pkgname dirsrv # for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release # also remove the space between % and global - this space is needed because # fedpkg verrel stupidly ignores comment lines -# % global prerel .rc1 +# % global prerel .a1 # also need the relprefix field for a pre-release e.g. .0 - also comment out for official release # % global relprefix 0. -%global selinux_variants strict targeted -# only F-14 and later use openldap for now -%global use_openldap 0 - -# fedora 15 and later uses tmpfiles.d -# otherwise, comment this out -#%{!?with_tmpfiles_d: %global with_tmpfiles_d %{_sysconfdir}/tmpfiles.d} - Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.2.10.14 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.2.11.24 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Provides: fedora-ds-base = %{version}-%{release} -Obsoletes: fedora-ds-base < 1.2.1-1 -Obsoletes: %{name}-selinux Requires: %{name}-libs = %{version}-%{release} -Provides: ldif2ldbm +Provides: ldif2ldbm BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: svrcore-devel -%if %{use_openldap} -BuildRequires: openldap-devel -%else BuildRequires: mozldap-devel -%endif BuildRequires: db4-devel BuildRequires: cyrus-sasl-devel BuildRequires: icu BuildRequires: libicu-devel BuildRequires: pcre-devel +BuildRequires: gcc-c++ # The following are needed to build the snmp ldap-agent BuildRequires: net-snmp-devel %ifnarch sparc sparc64 ppc ppc64 s390 s390x @@ -68,12 +54,7 @@ Requires(preun): policycoreutils Requires(postun): policycoreutils # the following are needed for some of our scripts -%if %{use_openldap} -BuildRequires: openldap-clients -%else Requires: mozldap-tools -%endif -# use_openldap assumes perl-Mozilla-LDAP is built with openldap support Requires: perl-Mozilla-LDAP # this is needed to setup SSL if you are not using the @@ -88,6 +69,10 @@ Requires: cyrus-sasl-md5 # this is needed for verify-db.pl Requires: db4-utils +# for setup-ds.pl to support ipv6 +Requires: perl-Socket6 +Requires: perl-NetAddr-IP + # This picks up libperl.so as a Requires, so we add this versioned one Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -103,8 +88,6 @@ Source0: http://port389.org/sources/%{name}-%{version}%{?prerel}.tar.bz # 389-ds-git.sh should be used to generate the source tarball from git Source1: %{name}-git.sh Source2: %{name}-devel.README -Patch0: 0001-Ticket-331-transaction-errors-with-db-4.3-and-db-4.2.patch -Patch1: 0002-Trac-Ticket-340-Change-on-SLAPI_MODRDN_NEWSUPERIOR-i.patch %description 389 Directory Server is an LDAPv3 compliant server. The base package includes @@ -116,11 +99,7 @@ Group: System Environment/Daemons BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: svrcore-devel -%if %{use_openldap} -BuildRequires: openldap-devel -%else BuildRequires: mozldap-devel -%endif BuildRequires: db4-devel BuildRequires: cyrus-sasl-devel BuildRequires: libicu-devel @@ -139,13 +118,7 @@ Requires: pkgconfig Requires: nspr-devel Requires: nss-devel Requires: svrcore-devel -%if %{use_openldap} -Requires: openldap-devel -%else Requires: mozldap-devel -%endif -Provides: fedora-ds-base-devel = %{version}-%{release} -Obsoletes: fedora-ds-base-devel < 1.2.1-1 %description devel Development Libraries and headers for the 389 Directory Server base package. @@ -161,15 +134,9 @@ SELinux policy interface for the 389 Directory Server base package. %prep %setup -q -n %{name}-%{version}%{?prerel} cp %{SOURCE2} README.devel -%patch0 -p1 -%patch1 -p1 %build -%if %{use_openldap} -OPENLDAP_FLAG="--with-openldap" -%endif -%{?with_tmpfiles_d: TMPFILES_FLAG="--with-tmpfiles-d=%{with_tmpfiles_d}"} -%configure --enable-autobind --with-selinux $OPENLDAP_FLAG $TMPFILES_FLAG +%configure --enable-autobind --with-selinux # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -352,6 +319,9 @@ exit 0 %{_libdir}/%{pkgname}/libslapd.so.* %changelog +* Fri Oct 4 2013 Rich Megginson - 1.2.11.24-1 +- rebase to 1.2.11.24 + * Tue Oct 16 2012 Rich Megginson - 1.2.10.14-2 - Trac Ticket #340 - Change on SLAPI_MODRDN_NEWSUPERIOR is not evaluated in acl diff --git a/sources b/sources index 47a3da5..0bc122c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb524ff20bbee0a2eab8413f15fd8cbf 389-ds-base-1.2.10.14.tar.bz2 +fcfbf17ce381f77b9608663cbd30cd1f 389-ds-base-1.2.11.24.tar.bz2