Use generic automake and autoconf, do not use openldap-specific ones

This commit is contained in:
Jan Šafránek 2007-08-01 09:00:39 +00:00
parent ed33aae062
commit 5b29ccb9b6
3 changed files with 3 additions and 32 deletions

View File

@ -2,8 +2,6 @@ openldap-2.2.29.tgz
MigrationTools-47.tar.gz MigrationTools-47.tar.gz
openldap-2.3.19.tgz openldap-2.3.19.tgz
db-4.4.20.tar.gz db-4.4.20.tar.gz
autoconf-2.13.1.tar.gz
automake-1.4a.tar.gz
openldap-2.3.24.tgz openldap-2.3.24.tgz
openldap-2.3.27.tgz openldap-2.3.27.tgz
openldap-2.3.28.tgz openldap-2.3.28.tgz

View File

@ -19,8 +19,8 @@ Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
Source1: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_22}.tgz Source1: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_22}.tgz
Source2: http://downloads.sleepycat.com/db-%{db_version}.tar.gz Source2: http://downloads.sleepycat.com/db-%{db_version}.tar.gz
Source3: ftp://ftp.OpenLDAP.org/pub/tools/autoconf-2.13.1.tar.gz #Source3: ftp://ftp.OpenLDAP.org/pub/tools/autoconf-2.13.1.tar.gz
Source4: ftp://ftp.OpenLDAP.org/pub/tools/automake-1.4a.tar.gz #Source4: ftp://ftp.OpenLDAP.org/pub/tools/automake-1.4a.tar.gz
Source5: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz Source5: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz
Source6: ldap.init Source6: ldap.init
Source7: migration-tools.txt Source7: migration-tools.txt
@ -154,17 +154,7 @@ includes older versions of the OpenLDAP shared libraries which may be
required by some applications. required by some applications.
%prep %prep
%setup -q -c -a 1 -a 2 -a 3 -a 4 -a 5 %setup -q -c -a 1 -a 2 -a 5
pushd db-%{db_version}
%patch400 -b .patch1
%patch401 -b .patch2
popd
pushd openldap-%{version_23}
cp %{_datadir}/libtool/config.{sub,guess} build/
popd
pushd openldap-%{version_23} pushd openldap-%{version_23}
%patch0 -p1 -b .config %patch0 -p1 -b .config
@ -204,26 +194,14 @@ pushd MigrationTools-%{migtools_version}
%patch307 -p1 %patch307 -p1
popd popd
autodir=`pwd`/auto-instroot
pushd autoconf-2.13.1
./configure --prefix=$autodir
make all install
popd
pushd automake-1.4a
./configure --prefix=$autodir
make all install
popd
pushd openldap-%{version_22} pushd openldap-%{version_22}
%patch100 -p1 -b .resolv %patch100 -p1 -b .resolv
%patch101 -p1 -b .CAN-2005-2069 %patch101 -p1 -b .CAN-2005-2069
%patch102 -p1 -b .ads %patch102 -p1 -b .ads
#%patch103 -p1 -b .nostrip
for subdir in build-servers build-compat ; do for subdir in build-servers build-compat ; do
mkdir $subdir mkdir $subdir
ln -s ../configure $subdir ln -s ../configure $subdir
done done
$autodir/bin/autoconf
popd popd
pushd openldap-%{version_23} pushd openldap-%{version_23}
@ -234,15 +212,12 @@ pushd openldap-%{version_23}
# build smbk5pwd with other overlays # build smbk5pwd with other overlays
ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd mv contrib/slapd-modules/smbk5pwd/README contrib/slapd-modules/smbk5pwd/README.smbk5pwd
autoconf
popd popd
%build %build
autodir=`pwd`/auto-instroot
dbdir=`pwd`/db-instroot dbdir=`pwd`/db-instroot
libtool='%{_bindir}/libtool' libtool='%{_bindir}/libtool'
tagname=CC; export tagname tagname=CC; export tagname
PATH=${autodir}/bin:${PATH}
%ifarch ia64 %ifarch ia64
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0" RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0"

View File

@ -1,5 +1,3 @@
5a9e617c1d5339d3c90c545c93e30949 autoconf-2.13.1.tar.gz
0faee50993f7e4fe00f4b921b640b84d automake-1.4a.tar.gz
6c4c72a1336aa45b463e738034c078d6 openldap-2.2.29.tgz 6c4c72a1336aa45b463e738034c078d6 openldap-2.2.29.tgz
3faf83eb8482e55979bda47f1d1e6501 MigrationTools-47.tar.gz 3faf83eb8482e55979bda47f1d1e6501 MigrationTools-47.tar.gz
33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz 33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz