From 50e6b488f270e5db03fbb9e86330380a19224e3e Mon Sep 17 00:00:00 2001 From: Nathan Kinder Date: Jan 24 2011 22:18:35 +0000 Subject: Updated spec and scripts for 1.2.8.a1 release. --- diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index 7dc11b6..ad4cc56 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.7.5 +VERSION=1.2.8 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 c873595..dcaa733 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.7.5 +VERSION=1.2.8 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 34f3d3b..608ec93 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -3,15 +3,15 @@ # 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 .a5 +%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 relprefix 0. %global use_openldap 1 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.2.7.5 +Version: 1.2.8 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ @@ -75,7 +75,7 @@ Requires: db4-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) # This is for the fedora-ds -> 389 run level hack -Requires(posttrans): /sbin/service +Requires(post): /sbin/service # for the init script Requires(post): /sbin/chkconfig @@ -95,6 +95,7 @@ the LDAP server and command line utilities for server administration. Summary: Development libraries for 389 Directory Server Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %if %{use_openldap} Requires: openldap-devel %else @@ -134,7 +135,6 @@ make DESTDIR="$RPM_BUILD_ROOT" install mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname} mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkgname} mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname} -mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{pkgname} #remove libtool and static libs rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.a @@ -142,10 +142,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la -install -p -m 644 ldap/servers/slapd/slapi-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/ -install -p -m 644 ldap/servers/plugins/replication/winsync-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/ -install -p -m 644 ldap/servers/plugins/replication/repl-session-plugin.h $RPM_BUILD_ROOT%{_includedir}/%{pkgname}/ - # make sure perl scripts have a proper shebang sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl @@ -297,8 +293,13 @@ end %doc LICENSE EXCEPTION LICENSE.GPLv2 README.devel %{_includedir}/%{pkgname} %{_libdir}/%{pkgname}/*.so +%{_libdir}/pkgconfig/* %changelog +* Fri Jan 21 2011 Nathan Kinder - 1.2.8-0.1.a1 +- 1.2.8-0.1.a1 release +- many bug fixes + * Thu Dec 16 2010 Rich Megginson - 1.2.7.5-1 - 1.2.7.5 release - git tag 389-ds-base-1.2.7.5 - Bug 663597 - Memory leaks in normalization code