rpms/openldap/devel openldap.spec,1.86,1.87
Jan Šafránek (jsafrane)
fedora-extras-commits at redhat.com
Thu Aug 2 12:50:18 UTC 2007
Author: jsafrane
Update of /cvs/pkgs/rpms/openldap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15334
Modified Files:
openldap.spec
Log Message:
do not distinguish between NPTL and non-NPTL platforms, we have NPTL everywhere
Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- openldap.spec 1 Aug 2007 09:00:39 -0000 1.86
+++ openldap.spec 2 Aug 2007 12:49:45 -0000 1.87
@@ -8,27 +8,23 @@
%define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
# For Fedora Core 5, we want 2.2 compatibility.
%define compat_version %{version_22}
-%define nptl_arches %{ix86} ia64 ppc ppc64 s390 s390x sparcv9 x86_64
Summary: The configuration files, libraries, and documentation for OpenLDAP
Name: openldap
Version: %{version_23}
-Release: 1%{?dist}
+Release: 2%{?dist}
License: OpenLDAP
Group: System Environment/Daemons
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
Source2: http://downloads.sleepycat.com/db-%{db_version}.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
-Source5: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz
-Source6: ldap.init
-Source7: migration-tools.txt
-Source8: autofs.schema
-Source9: README.upgrading
-Source10: http://www.OpenLDAP.org/doc/admin/guide.html
-Source11: nptl-abi-note.S
-Source12: README.evolution
+Source3: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz
+Source4: ldap.init
+Source5: migration-tools.txt
+Source6: autofs.schema
+Source7: README.upgrading
+Source8: http://www.OpenLDAP.org/doc/admin/guide.html
+Source9: README.evolution
# Patches that are still valid for 2.3
Patch0: openldap-2.3.34-config.patch
@@ -154,7 +150,7 @@
required by some applications.
%prep
-%setup -q -c -a 1 -a 2 -a 5
+%setup -q -c -a 1 -a 2 -a 3
pushd openldap-%{version_23}
%patch0 -p1 -b .config
@@ -229,58 +225,26 @@
# Build Berkeley DB and install it into a temporary area, isolating OpenLDAP
# from any future changes to the system-wide Berkeley DB library. Version 4.2
# or later is required by the BDB backend in OpenLDAP 2.1 and later.
-buildbdb() {
- subdir=$1
- shift
- install -d db-%{db_version}/build-rpm${subdir:+-${subdir}}
- pushd db-%{db_version}/build-rpm${subdir:+-${subdir}}
- echo "${1:+db_cv_mutex=$1}" > config.cache
- shift
- ../dist/configure -C \
- --with-pic \
- --disable-static \
- --enable-shared \
- --with-uniquename=_openldap_slapd_rhl_42 \
- --prefix=${dbdir} \
- --includedir=${dbdir}/include \
- --libdir=${dbdir}/%{_lib}${subdir:+/${subdir}}
- # XXX db-4.2.x handles O_DIRECT (by disabling on linux) correctly.
- # XXX hack out O_DIRECT support in db4 for now.
- perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h
- # fix libtool: no rpath
- perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
-
- if test -n "$nptl_lo" ; then
- ./libtool --mode=compile %{__cc} -o $nptl_lo -c $nptl_s
- fi
- make %{_smp_mflags} libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo"
- make install libdb_base=libslapd_db libso_base=libslapd_db LIBSO_LIBS="$nptl_lo" strip="false"
- ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
- popd
-}
-
-# Build an NPTL libdb if we're on a Linux arch with NPTL. NPTL gives us the
-# ability to share mutexes between threads in different processes, and to have
-# threads in both honor those locks. We have to do this because if you build
-# libdb with support for intra-process locks, it dies if you don't have it and
-# the application has specified to libdb that it's multi-threaded (as slapd
-# does).
-%ifarch %{nptl_arches}
-unset nptl_s nptl_lo
-case %{_os} in
-linux|Linux)
- nptl_s=$RPM_SOURCE_DIR/nptl-abi-note.S
- nptl_lo=nptl-abi-note.lo
- ;;
-esac
-buildbdb tls POSIX/pthreads/library
-unset nptl_s nptl_lo
-%endif
-
-# Build a non-NPTL libdb and tools, able to only use intra-process thread
-# locks. Useless for bdb's purposes (bdb requires shared env support), but
-# acceptable for ldbm.
-buildbdb "" POSIX/pthreads/library/private
+install -d db-%{db_version}/build-rpm
+pushd db-%{db_version}/build-rpm
+../dist/configure -C \
+ --with-pic \
+ --disable-static \
+ --enable-shared \
+ --with-uniquename=_openldap_slapd_rhl_42 \
+ --prefix=${dbdir} \
+ --includedir=${dbdir}/include \
+ --libdir=${dbdir}/%{_lib}${subdir:+/${subdir}}
+# XXX db-4.2.x handles O_DIRECT (by disabling on linux) correctly.
+# XXX hack out O_DIRECT support in db4 for now.
+perl -pi -e 's/#define HAVE_O_DIRECT 1/#undef HAVE_O_DIRECT/' db_config.h
+# fix libtool: no rpath
+perl -pi -e 's|hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=\"-L\\\$libdir\"|g;' libtool
+
+make %{_smp_mflags} libdb_base=libslapd_db libso_base=libslapd_db
+make install libdb_base=libslapd_db libso_base=libslapd_db strip="false"
+ln -sf libslapd_db.so ${dbdir}/%{_lib}/${subdir}/libdb.so
+popd
# Find OpenSSL's header and library dependencies.
if pkg-config openssl ; then
@@ -303,7 +267,6 @@
make %{_smp_mflags}
popd
-# Build 2.2.
build() {
%configure \
--with-threads=posix \
@@ -407,25 +370,6 @@
$libtool --mode=install /usr/bin/install -c -s -m 755 slapd $RPM_BUILD_ROOT/%{_libdir}/compat-openldap/slapcat
popd
-# Install servers.
-%ifarch %{nptl_arches}
-case %{_target_platform} in
- i386*|i486*) archp=i486; arches="i586 i686";;
- i586*) archp=i586; arches=i686;;
- i686*) archp=i686; arches=;;
- athlon*) archp=i686; arches=;;
- *) archp=; arches=;;
-esac
-pushd db-instroot/%{_lib}/tls/
-install -d $RPM_BUILD_ROOT/%{_libdir}/tls/${archp}/
-install -m755 libslapd_db-*.*.so $RPM_BUILD_ROOT/%{_libdir}/tls/${archp}/
-for arch in $arches ; do
- install -d $RPM_BUILD_ROOT/%{_libdir}/tls/${arch}/
- ln $RPM_BUILD_ROOT/%{_libdir}/tls/${archp}/* $RPM_BUILD_ROOT/%{_libdir}/tls/${arch}/
-done
-popd
-%endif
-
pushd db-instroot/%{_lib}/
install -d $RPM_BUILD_ROOT/%{_libdir}/
install -m755 libslapd_db-*.*.so $RPM_BUILD_ROOT/%{_libdir}/
@@ -681,14 +625,6 @@
%attr(0755,root,root) %{_libdir}/libslapd_db-*.*.so
%attr(0755,root,root) %dir %{_libdir}/openldap
%attr(0755,root,root) %{_libdir}/openldap/[^b]*
-%ifarch %{nptl_arches}
-%ifnarch %{ix86}
-%attr(0755,root,root) %{_libdir}/tls/libslapd_db-*.*.so
-%else
-%dir %attr(0755,root,root) %{_libdir}/tls/*
-%attr(0755,root,root) %{_libdir}/tls/*/libslapd_db-*.*.so
-%endif
-%endif
%files servers-sql
%defattr(-,root,root)
@@ -717,6 +653,11 @@
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Thu Aug 2 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-2%{?dist}
+- do not use specific automake and autoconf
+- do not distinguish between NPTL and non-NPTL platforms, we have NPTL
+ everywhere
+
* Tue Jul 31 2007 Jan Safranek <jsafranek at redhat.com> 2.3.37-1%{?dist}
- new upstream version
More information about the fedora-extras-commits
mailing list