- dropped unnecessary major symlinks, soname symlinks (= just .so) removed from ...

- package svrcore header and static lib as svrcore-devel
- release 1

Changed files:
    mozldap.spec -> 1.12

diff --git a/mozldap.spec b/mozldap.spec
index 08cbc8523635b5cb76b1fa4c908061781ac257d8..172a3e073c9bd44b7dd0153c27af4ba738536f21 100644 (file)
--- a/mozldap.spec
+++ b/mozldap.spec
@@ -1,18 +1,17 @@
 %define        nspr_version    4.6
-%define        nspr_evr 1:%{nspr_version}
+%define        nspr_evr        1:%{nspr_version}
 %define        nss_version     3.11
-%define        nss_evr 1:%{nss_version}
+%define        nss_evr         1:%{nss_version}
 %define        svrcore_version 4.0.1
-%define        major           5
-%define        minor           17
+%define        mozldap_version 5.17
 Summary:       Mozilla LDAP C SDK
 Summary(pl):   Biblioteki Mozilla LDAP C SDK
 Name:          mozldap
-Version:       %{major}.%{minor}
-Release:       0.2
-License:       MPL/GPL/LGPL
+Version:       %{mozldap_version}
+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%{major}.17/src/ldapcsdk-5.1.7.tar.gz
+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
 URL:           http://www.mozilla.org/directory/csdk.html
 BuildRequires: gawk
@@ -38,25 +37,13 @@ komunikowa
 wywodz± siê z bibliotek LDAP University of Michigan i Netscape.
 Wykorzystuj± biblioteki Mozilla NSPR i NSS do kryptografii.
 
-%package tools
-Summary:       Tools for the Mozilla LDAP C SDK
-Summary(pl):   Narzêdzia dla bibliotek Mozilla LDAP C SDK
-Group:         Applications/System
-Requires:      mozldap = %{version}-%{release}
-
-%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 devel
 Summary:       Development files and examples for Mozilla LDAP C SDK
 Summary(pl):   Pliki programistyczne i przyk³ady dla bibliotek Mozilla LDAP C SDK
 Group:         Development/Libraries
-Requires:      mozldap = %{version}-%{release}
+Requires:      %{name} = %{mozldap_version}-%{release}
+Requires:      nspr-devel >= %{nspr_evr}
+Requires:      nss-devel >= %{nss_evr}
 
 %description devel
 Header and other files for doing development with the Mozilla LDAP C
@@ -70,7 +57,7 @@ bibliotek Mozilla LDAP C SDK
 Summary:       Static Mozilla LDAP C SDK libraries
 Summary(pl):   Statyczne biblioteki Mozilla LDAP C SDK
 Group:         Development/Libraries
-Requires:      mozldap-devel = %{version}-%{release}
+Requires:      %{name}-devel = %{mozldap_version}-%{release}
 
 %description static
 Static Mozilla LDAP C SDK libraries.
@@ -78,13 +65,51 @@ Static Mozilla LDAP C SDK libraries.
 %description static -l pl
 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
+Group:         Applications/System
+Requires:      %{name} = %{mozldap_version}-%{release}
+
+%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.
+
 %prep
 %setup -q -n mozilla
 
 %build
 # build local svrcore
-%{__make} -C security/coreconf
+%{__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
 
@@ -129,26 +154,39 @@ cd directory/c-sdk/ldap
 cp -r examples $RPM_BUILD_ROOT%{_datadir}/mozldap
 install examples/xmplflt.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
 install libraries/libldap/*.conf $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
-cd ..
+cd -
 
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-sed mozldap.pc.in -e "
+sed directory/c-sdk/mozldap.pc.in -e "
        s,%%libdir%%,%{_libdir},g
        s,%%prefix%%,%{_prefix},g
        s,%%exec_prefix%%,%{_prefix},g
        s,%%includedir%%,%{_includedir}/mozldap,g
        s,%%NSPR_VERSION%%,%{nspr_version},g
        s,%%NSS_VERSION%%,%{nss_version},g
-       s,%%SVRCORE_VERSION%%,%{svrcore_version},g
-       s,%%MOZLDAP_VERSION%%,%{version},g
+       s,%%MOZLDAP_VERSION%%,%{mozldap_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.%{major}.%{minor}
-       ln -s $file.%{major}.%{minor} $file.%{major}
-       ln -s $file.%{major} $file
+       mv $file $file.%{mozldap_version}
+       ln -s $file.%{mozldap_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
@@ -158,21 +196,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.%{major}.%{minor}
-%attr(755,root,root) %{_libdir}/lib*.so.%{major}
-
-%files tools
-%defattr(644,root,root,755)
-%dir %{_libdir}/mozldap
-%attr(755,root,root) %{_libdir}/mozldap/ldap*
+%attr(755,root,root) %{_libdir}/libldap50.so.*.*
+%attr(755,root,root) %{_libdir}/libprldap50.so.*.*
+%attr(755,root,root) %{_libdir}/libssldap50.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/mozldap
 %{_pkgconfigdir}/mozldap.pc
 %{_datadir}/mozldap
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libiutil50.a
+%{_libdir}/liblber50.a
+%{_libdir}/libldap50.a
+%{_libdir}/libldif50.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