diff --git a/openldap.spec b/openldap.spec index 5cbc124..f660e29 100644 --- a/openldap.spec +++ b/openldap.spec @@ -1,24 +1,20 @@ %define migtools_version 47 %define db_version 4.4.20 %define ldbm_backend berkeley -%define version_23 2.3.39 -%define version_24 2.4.6 +%define version 2.4.6 %define evolution_connector_prefix %{_libdir}/evolution-openldap %define evolution_connector_includedir %{evolution_connector_prefix}/include %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib} -# For Fedora 9, we want 2.3 compatibility. -%define compat_version %{version_23} Summary: The configuration files, libraries, and documentation for OpenLDAP Name: openldap -Version: %{version_24} +Version: %{version} Release: 1%{?dist} License: OpenLDAP Group: System Environment/Daemons -Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_24}.tgz -Source1: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz -Source2: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz -Source3: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz +Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz +Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz +Source2: ftp://ftp.padl.com/pub/MigrationTools-%{migtools_version}.tar.gz Source4: ldap.init Source5: migration-tools.txt Source6: autofs.schema @@ -39,10 +35,6 @@ Patch8: openldap-2.3.34-pthread.patch Patch9: openldap-2.3.37-smbk5pwd.patch Patch10: openldap-2.4.6-multilib.patch -# Patches for 2.3.39 -Patch100: openldap-2.2.13-pie.patch -Patch101: openldap-2.3.11-nosql.patch - # Patches for the evolution library Patch200: openldap-2.4.6-evolution-ntlm.patch @@ -61,11 +53,12 @@ Patch400: db-4.4.20-1.patch Patch401: db-4.4.20-2.patch URL: http://www.openldap.org/ -BuildRoot: %{_tmppath}/%{name}-%{version_24}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel BuildRequires: openssl-devel, pam-devel, perl, pkgconfig, tcp_wrappers-devel, BuildRequires: unixODBC-devel, libtool-ltdl-devel, groff Requires: glibc >= 2.2.3-48, mktemp +Obsoletes: compat-openldap %description OpenLDAP is an open source suite of LDAP (Lightweight Directory Access @@ -79,8 +72,8 @@ libraries, and documentation for OpenLDAP. %package devel Summary: OpenLDAP development libraries and header files. Group: Development/Libraries -Requires: openldap = %{version_24}-%{release}, cyrus-sasl-devel >= 2.1 -Provides: openldap-evolution-devel = %{version_24}-%{release} +Requires: openldap = %{version}-%{release}, cyrus-sasl-devel >= 2.1 +Provides: openldap-evolution-devel = %{version}-%{release} %description devel The openldap-devel package includes the development libraries and @@ -94,7 +87,7 @@ customized LDAP clients. Summary: OpenLDAP servers and related files. # OpenLDAP server includes Berkeley DB library, which is licensed under Sleepycat and BSD licenses) License: OpenLDAP and (Sleepycat and BSD) -Requires: fileutils, make, openldap = %{version_24}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser +Requires: fileutils, make, openldap = %{version}-%{release}, openssl, /usr/sbin/useradd, /sbin/chkconfig, /sbin/runuser Group: System Environment/Daemons %description servers @@ -108,7 +101,7 @@ migration scripts, and related files. %package servers-sql Summary: OpenLDAP server SQL support module. -Requires: openldap-servers = %{version_24}-%{release} +Requires: openldap-servers = %{version}-%{release} Group: System Environment/Daemons %description servers-sql @@ -122,7 +115,7 @@ slapd server can use to read data from an RDBMS. %package clients Summary: Client programs for OpenLDAP. -Requires: openldap = %{version_24}-%{release} +Requires: openldap = %{version}-%{release} Group: Applications/Internet %description clients @@ -134,33 +127,15 @@ similar to the way DNS (Domain Name System) information is propagated over the Internet. The openldap-clients package contains the client programs needed for accessing and modifying OpenLDAP directories. -# Declare this subpackage LAST. This version tag redefines %%{version}, so -# any future use would reference the wrong version. -%package -n compat-openldap -Summary: OpenLDAP compatibility shared libraries. -Group: System Environment/Libraries -# Require the current OpenLDAP libraries package in an attempt to ensure that -# we have a /etc/openldap/ldap.conf file on the system. -Requires: openldap = %{version_24}-%{release} -# Why this weirdo version number? We want to ensure that version comparisons -# for this package always sort in the same order as the main openldap package. -Version: %{version_24}_%{compat_version} - -%description -n compat-openldap -OpenLDAP is an open source suite of LDAP (Lightweight Directory Access -Protocol) applications and development tools. The compat-openldap package -includes older versions of the OpenLDAP shared libraries which may be -required by some applications. - %prep -%setup -q -c -a 1 -a 2 -a 3 +%setup -q -c -a 1 -a 2 pushd db-%{db_version} %patch400 -b .patch1 %patch401 -b .patch2 popd -pushd openldap-%{version_24} +pushd openldap-%{version} %patch0 -p1 -b .config %patch1 -p1 -b .ldaprc %patch2 -p1 -b .setugid @@ -179,11 +154,11 @@ popd # non-standard NTLM bind type which is needed to connect to Win2k GC servers # (Win2k3 supports SASL with DIGEST-MD5, so this shouldn't be needed for those # servers, though as of version 1.4 the connector doesn't try SASL first). -if ! cp -al openldap-%{version_24} evo-openldap-%{version_24} ; then - rm -fr evo-openldap-%{version_24} - cp -a openldap-%{version_24} evo-openldap-%{version_24} +if ! cp -al openldap-%{version} evo-openldap-%{version} ; then + rm -fr evo-openldap-%{version} + cp -a openldap-%{version} evo-openldap-%{version} fi -pushd evo-openldap-%{version_24} +pushd evo-openldap-%{version} %patch200 -p1 -b .evolution-ntlm popd @@ -198,16 +173,7 @@ pushd MigrationTools-%{migtools_version} %patch307 -p1 popd -pushd openldap-%{version_23} -%patch100 -p1 -%patch101 -p1 - for subdir in build-servers build-compat ; do - mkdir $subdir - ln -s ../configure $subdir - done -popd - -pushd openldap-%{version_24} +pushd openldap-%{version} for subdir in build-servers build-clients ; do mkdir $subdir ln -s ../configure $subdir @@ -265,15 +231,6 @@ CFLAGS="$CPPFLAGS $RPM_OPT_FLAGS -D_REENTRANT -fPIC"; export CFLAGS LDFLAGS="-L${dbdir}/%{_lib} $OPENSSL_LDFLAGS" ; export LDFLAGS LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}; export LD_LIBRARY_PATH -# Build the client libraries for the compat package. -pushd openldap-%{compat_version}/build-compat -%configure \ - --enable-slapd --disable-slurpd \ - --with-threads=posix --enable-static --enable-shared --enable-dynamic \ - --enable-local --with-tls --with-cyrus-sasl --without-kerberos -make %{_smp_mflags} -popd - build() { %configure \ --with-threads=posix \ @@ -302,7 +259,7 @@ make %{_smp_mflags} LIBTOOL="$libtool" # Build the servers with Kerberos support (for password checking, mainly). LIBS=-lpthread; export LIBS LD_LIBRARY_PATH=${dbdir}/%{_lib}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}; export LD_LIBRARY_PATH -pushd openldap-%{version_24}/build-servers +pushd openldap-%{version}/build-servers build \ --enable-plugins \ --enable-slapd \ @@ -330,7 +287,7 @@ popd # Build clients without Kerberos password-checking support, which is only # useful in the server anyway, to avoid stray dependencies. -pushd openldap-%{version_24}/build-clients +pushd openldap-%{version}/build-clients build \ --disable-slapd \ --enable-shared \ @@ -342,7 +299,7 @@ popd # Build evolution-specific clients just as we would normal clients, except with # a different installation directory in mind and no shared libraries. -pushd evo-openldap-%{version_24} +pushd evo-openldap-%{version} build \ --disable-slapd \ --disable-shared \ @@ -359,20 +316,7 @@ popd libtool='%{_bindir}/libtool' tagname=CC; export tagname -# Install the 2.0 or 2.1 shared libraries for compatibility. The two sets of -# libraries share sonames, so we have to choose one or the other. mkdir -p $RPM_BUILD_ROOT/%{_libdir}/ -pushd openldap-%{compat_version}/build-compat/libraries - make install DESTDIR=$RPM_BUILD_ROOT STRIP="" - rm $RPM_BUILD_ROOT/%{_libdir}/*.a - rm $RPM_BUILD_ROOT/%{_libdir}/*.la - rm $RPM_BUILD_ROOT/%{_libdir}/*.so -popd - -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/compat-openldap -pushd openldap-%{compat_version}/build-compat/servers/slapd - $libtool --mode=install /usr/bin/install -c -s -m 755 slapd $RPM_BUILD_ROOT/%{_libdir}/compat-openldap/slapcat -popd pushd db-instroot/%{_lib}/ install -d $RPM_BUILD_ROOT/%{_libdir}/ @@ -383,7 +327,7 @@ pushd db-%{db_version} mv LICENSE LICENSE.bdb-backend popd -pushd openldap-%{version_24}/build-servers +pushd openldap-%{version}/build-servers make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" STRIP="" popd @@ -396,7 +340,7 @@ popd # Install clients and shared libraries. Install the evo-specific versions # first so that any conflicting files are overwritten by generic versions. -pushd evo-openldap-%{version_24} +pushd evo-openldap-%{version} make install DESTDIR=$RPM_BUILD_ROOT \ includedir=%{evolution_connector_includedir} \ libdir=%{evolution_connector_libdir} \ @@ -407,7 +351,7 @@ install -m644 \ $RPM_SOURCE_DIR/README.evolution \ $RPM_BUILD_ROOT/%{evolution_connector_prefix}/ popd -pushd openldap-%{version_24}/build-clients +pushd openldap-%{version}/build-clients make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} LIBTOOL="$libtool" STRIP="" popd @@ -577,11 +521,11 @@ fi %files %defattr(-,root,root) -%doc openldap-%{version_24}/ANNOUNCEMENT -%doc openldap-%{version_24}/CHANGES -%doc openldap-%{version_24}/COPYRIGHT -%doc openldap-%{version_24}/LICENSE -%doc openldap-%{version_24}/README +%doc openldap-%{version}/ANNOUNCEMENT +%doc openldap-%{version}/CHANGES +%doc openldap-%{version}/COPYRIGHT +%doc openldap-%{version}/LICENSE +%doc openldap-%{version}/README %attr(0755,root,root) %dir %{_sysconfdir}/openldap %attr(0755,root,root) %dir %{_sysconfdir}/openldap/cacerts %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf @@ -592,26 +536,14 @@ fi %attr(0644,root,root) %{_mandir}/man5/ldap.conf.5* %attr(0755,root,root) %dir %{_datadir}/openldap -%files -n compat-openldap -%defattr(-,root,root) -%doc openldap-%{compat_version}/ANNOUNCEMENT -%doc openldap-%{compat_version}/COPYRIGHT -%doc openldap-%{compat_version}/LICENSE -%attr(0755,root,root) %{_libdir}/liblber-2.3.so.* -%attr(0755,root,root) %{_libdir}/libldap-2.3.so.* -%attr(0755,root,root) %{_libdir}/libldap_r-2.3.so.* -%attr(0755,ldap,ldap) %dir %{_libdir}/compat-openldap -%attr(0755,root,root) %{_libdir}/compat-openldap/slapcat - - %files servers %defattr(-,root,root) %doc README.migration %doc TOOLS.migration %doc db-%{db_version}/LICENSE.bdb-backend %doc $RPM_SOURCE_DIR/README.upgrading $RPM_SOURCE_DIR/guide.html -%doc openldap-%{version_24}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd -%doc openldap-%{version_24}/doc/guide/admin/*.gif +%doc openldap-%{version}/contrib/slapd-modules/smbk5pwd/README.smbk5pwd +%doc openldap-%{version}/doc/guide/admin/*.gif %ghost %config %{_sysconfdir}/pki/tls/certs/slapd.pem %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/openldap/ldap*.conf @@ -642,8 +574,8 @@ fi %files servers-sql %defattr(-,root,root) -%doc openldap-%{version_24}/servers/slapd/back-sql/docs/* -%doc openldap-%{version_24}/servers/slapd/back-sql/rdbms_depend +%doc openldap-%{version}/servers/slapd/back-sql/docs/* +%doc openldap-%{version}/servers/slapd/back-sql/rdbms_depend %attr(0755,root,root) %{_libdir}/openldap/back_sql.la %attr(0755,root,root) %{_libdir}/openldap/back_sql*.so.* @@ -654,7 +586,7 @@ fi %files devel %defattr(-,root,root) -%doc openldap-%{version_24}/doc/drafts openldap-%{version_24}/doc/rfc +%doc openldap-%{version}/doc/drafts openldap-%{version}/doc/rfc %attr(0755,root,root) %{_libdir}/libl*.so %attr(0644,root,root) %{_libdir}/libl*.a %attr(0644,root,root) %{_includedir}/* @@ -669,6 +601,7 @@ fi %changelog * Wed Nov 21 2007 Jan Safranek 2.4.6-1%{?dist} - new upstream version (openldap-2.4) +- deprecating compat- package * Mon Nov 5 2007 Jan Safranek 2.3.39-1%{?dist} - new upstream release