%define nspr_evr 1:%{nspr_version}
%define nss_version 3.11
%define nss_evr 1:%{nss_version}
-%define svrcore_version 4.0.1
-%define mozldap_version 5.17
+%define svrcore_version 4.0.3
Summary: Mozilla LDAP C SDK
-Summary(pl): Biblioteki Mozilla LDAP C SDK
+Summary(pl.UTF-8): Biblioteki Mozilla LDAP C SDK
Name: mozldap
-Version: %{mozldap_version}
+Version: 6.0.2
Release: 1
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: Libraries
-Source0: ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{mozldap_version}/src/ldapcsdk-5.1.7.tar.gz
-# Source0-md5: 66ddb43e984c0df67e21afb4dc6977b1
+Source0: ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{version}/src/mozldap-%{version}.tar.gz
+# Source0-md5: 60d1d6fa115efe3e54974243c1958b99
+Patch0: %{name}-link.patch
URL: http://www.mozilla.org/directory/csdk.html
+BuildRequires: autoconf >= 2.13
+BuildRequires: cyrus-sasl-devel >= 2.0
BuildRequires: gawk
BuildRequires: libstdc++-devel
BuildRequires: nspr-devel >= %{nspr_evr}
BuildRequires: nss-devel >= %{nss_evr}
BuildRequires: perl-base
BuildRequires: pkgconfig
-#BuildRequires: svrcore-devel >= %{svrcore_version}
+BuildRequires: svrcore-devel >= %{svrcore_version}
Requires: nspr >= %{nspr_evr}
Requires: nss >= %{nss_evr}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _noautoreqdep libldap60.so libprldap60.so libssldap60.so
+
%description
The Mozilla LDAP C SDK is a set of libraries that allow applications
to communicate with LDAP directory servers. These libraries are
derived from the University of Michigan and Netscape LDAP libraries.
They use Mozilla NSPR and NSS for crypto.
-%description -l pl
-Mozilla LDAP C SDK to zestaw bibliotek pozwalaj±cych aplikacjom
-komunikowaæ siê z serwerami us³ug katalogowych LDAP. Biblioteki te
-wywodz± siê z bibliotek LDAP University of Michigan i Netscape.
-Wykorzystuj± biblioteki Mozilla NSPR i NSS do kryptografii.
+%description -l pl.UTF-8
+Mozilla LDAP C SDK to zestaw bibliotek pozwalających aplikacjom
+komunikować się z serwerami usług katalogowych LDAP. Biblioteki te
+wywodzą się z bibliotek LDAP University of Michigan i Netscape.
+Wykorzystują biblioteki Mozilla NSPR i NSS do kryptografii.
%package devel
Summary: Development files and examples for Mozilla LDAP C SDK
-Summary(pl): Pliki programistyczne i przyk³ady dla bibliotek Mozilla LDAP C SDK
+Summary(pl.UTF-8): Pliki programistyczne i przykłady dla bibliotek Mozilla LDAP C SDK
Group: Development/Libraries
-Requires: %{name} = %{mozldap_version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: nspr-devel >= %{nspr_evr}
Requires: nss-devel >= %{nss_evr}
Header and other files for doing development with the Mozilla LDAP C
SDK.
-%description devel -l pl
-Pliki nag³ówkowe i inne do tworzenia oprogramowania z u¿yciem
+%description devel -l pl.UTF-8
+Pliki nagłówkowe i inne do tworzenia oprogramowania z użyciem
bibliotek Mozilla LDAP C SDK
%package static
Summary: Static Mozilla LDAP C SDK libraries
-Summary(pl): Statyczne biblioteki Mozilla LDAP C SDK
+Summary(pl.UTF-8): Statyczne biblioteki Mozilla LDAP C SDK
Group: Development/Libraries
-Requires: %{name}-devel = %{mozldap_version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
%description static
Static Mozilla LDAP C SDK libraries.
-%description static -l pl
+%description static -l pl.UTF-8
Statyczne biblioteki Mozilla LDAP C SDK.
%package tools
Summary: Tools for the Mozilla LDAP C SDK
-Summary(pl): Narzêdzia dla bibliotek Mozilla LDAP C SDK
+Summary(pl.UTF-8): Narzędzia dla bibliotek Mozilla LDAP C SDK
Group: Applications/System
-Requires: %{name} = %{mozldap_version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: svrcore >= %{svrcore_version}
%description tools
The mozldap-tools package provides the ldapsearch, ldapmodify, and
ldapdelete tools that use the Mozilla LDAP C SDK libraries.
-%description tools -l pl
-Ten pakiet dostarcza narzêdzia ldapsearch, ldapmodify i ldapdelete
-wykorzystuj±ce biblioteki Mozilla LDAP C SDK.
-
-%package -n svrcore-devel
-Summary: svrcore - development files for secure PIN handling using NSS crypto
-Summary(pl): svrcore - pliki programistyczne do bezpiecznej obs³ugi PIN-ów przy u¿yciu NSS
-Version: %{svrcore_version}
-Group: Development/Libraries
-Requires: nspr-devel >= %{nspr_evr}
-Requires: nss-devel >= %{nss_evr}
-
-%description -n svrcore-devel
-svrcore provides applications with several ways to handle secure PIN
-storage e.g. in an application that must be restarted, but needs the
-PIN to unlock the private key and other crypto material, without user
-intervention. svrcore uses the facilities provided by NSS.
-
-%description -n svrcore-devel -l pl
-svrcore udostêpnia aplikacjom kilka sposobów obs³ugi bezpiecznego
-przechowywania PIN-ów, np. w aplikacji, która musi byæ zrestartowana,
-ale wymaga PIN-u do odblokowania klucza prywatnego i innych danych
-kryptograficznych bez interwencji u¿ytkownika. svrcore wykorzystuje
-funkcje udostêpniane przez bibliotekê NSS.
+%description tools -l pl.UTF-8
+Ten pakiet dostarcza narzędzia ldapsearch, ldapmodify i ldapdelete
+wykorzystujące biblioteki Mozilla LDAP C SDK.
%prep
-%setup -q -n mozilla
+%setup -q
+%patch0 -p1
%build
-# build local svrcore
-%{__make} -C security/coreconf \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags}"
-%{__make} -C security/svrcore \
- CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -I. -I/usr/include/nspr -I/usr/include/nss"
-# end svrcore
-
-cd directory/c-sdk
+cd mozilla/directory/c-sdk
+%{__autoconf}
%configure \
%ifarch %{x8664} ia64 ppc64 s390x
--enable-64bit \
%endif
--disable-debug \
+ --enable-clu \
--enable-optimize \
- --with-nspr \
- --with-nspr-inc=%{_includedir}/nspr \
- --with-nspr-lib=%{_libdir} \
- --with-nss \
- --with-nss-inc=%{_includedir}/nss \
- --with-nss-lib=%{_libdir} \
- --with-svrcore \
- --with-svrcore-inc=$PWD/../../security/svrcore
+ --with-sasl \
+ --with-system-nspr \
+ --with-system-nss \
+ --with-system-svrcore
%ifarch %{x8664} ppc64 ia64 s390x
USE_64=1
%endif
%{__make} \
- BUILDCLU=1 \
- HAVE_SVRCORE=1 \
- BUILD_OPT=1 \
XCFLAGS="%{rpmcflags}"
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}/mozldap
+cd mozilla
install dist/lib/lib*ldap*.so $RPM_BUILD_ROOT%{_libdir}
install dist/bin/ldap* $RPM_BUILD_ROOT%{_libdir}/mozldap
install dist/public/ldap/*.h $RPM_BUILD_ROOT%{_includedir}/mozldap
-install directory/c-sdk/ldap/libraries/lib*/lib*50.a $RPM_BUILD_ROOT%{_libdir}
+install directory/c-sdk/ldap/libraries/lib*/lib*60.a $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
cd directory/c-sdk/ldap
s,%%includedir%%,%{_includedir}/mozldap,g
s,%%NSPR_VERSION%%,%{nspr_version},g
s,%%NSS_VERSION%%,%{nss_version},g
- s,%%MOZLDAP_VERSION%%,%{mozldap_version},g
+ s,%%MOZLDAP_VERSION%%,%{version},g
" > $RPM_BUILD_ROOT%{_pkgconfigdir}/mozldap.pc
cd $RPM_BUILD_ROOT%{_libdir}
-for file in libssldap50.so libprldap50.so libldap50.so; do
- mv $file $file.%{mozldap_version}
- ln -s $file.%{mozldap_version} $file
+for file in libssldap60.so libprldap60.so libldap60.so; do
+ mv $file $file.%{version}
+ ln -s $file.%{version} $file
done
-cd -
-
-# svrcore
-install -d $RPM_BUILD_ROOT%{_includedir}/svrcore
-install dist/public/svrcore/*.h $RPM_BUILD_ROOT%{_includedir}/svrcore
-install dist/*.OBJ/lib/libsvrcore.a $RPM_BUILD_ROOT%{_libdir}
-sed security/svrcore/svrcore.pc.in -e "
- s,%%libdir%%,%{_libdir},g
- s,%%prefix%%,%{_prefix},g
- s,%%exec_prefix%%,%{_prefix},g
- s,%%includedir%%,%{_includedir}/svrcore,g
- s,%%NSPR_VERSION%%,%{nspr_version},g
- s,%%NSS_VERSION%%,%{nss_version},g
- s,%%SVRCORE_VERSION%%,%{svrcore_version},g
-" > $RPM_BUILD_ROOT%{_pkgconfigdir}/svrcore.pc
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libldap50.so.*.*
-%attr(755,root,root) %{_libdir}/libprldap50.so.*.*
-%attr(755,root,root) %{_libdir}/libssldap50.so.*.*
+%attr(755,root,root) %{_libdir}/libldap60.so.*.*
+%attr(755,root,root) %{_libdir}/libprldap60.so.*.*
+%attr(755,root,root) %{_libdir}/libssldap60.so.*.*
%files devel
%defattr(644,root,root,755)
%files static
%defattr(644,root,root,755)
-%{_libdir}/libiutil50.a
-%{_libdir}/liblber50.a
-%{_libdir}/libldap50.a
-%{_libdir}/libldif50.a
+%{_libdir}/libiutil60.a
+%{_libdir}/liblber60.a
+%{_libdir}/libldap60.a
+%{_libdir}/libldif60.a
%files tools
%defattr(644,root,root,755)
%dir %{_libdir}/mozldap
%attr(755,root,root) %{_libdir}/mozldap/ldap*
-
-%files -n svrcore-devel
-%defattr(644,root,root,755)
-%doc security/svrcore/README
-%{_libdir}/libsvrcore.a
-%{_includedir}/svrcore
-%{_pkgconfigdir}/svrcore.pc