- use x8664 macro, missing dir

[packages/mozldap.git] / mozldap.spec

diff --git a/mozldap.spec b/mozldap.spec
index ef3b1c413a49952432aa0e748ce34b27250a5061..b3d6dfe4a231c223a8cf6ee0ca6f521e6de82162 100644 (file)
--- a/mozldap.spec
+++ b/mozldap.spec
@@ -9,7 +9,7 @@ Summary:        Mozilla LDAP C SDK
 Summary(pl):   Mozilla LDAP C SDK
 Name:          mozldap
 Version:       %{major}.%{minor}
-Release:       0.1
+Release:       0.2
 License:       MPL/GPL/LGPL
 Group:         System
 Source0:       ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v%{major}.17/src/ldapcsdk-5.1.7.tar.gz
@@ -66,17 +66,14 @@ Statyczne biblioteki Mozilla LDAP C SDK.
 %setup -q -n mozilla
 
 %build
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch %{x8664} ia64 ppc64 s390x
 arg64="--enable-64bit"
 %endif
 
 # build local svrcore
-cd security/coreconf
-%{__make}
-cd ../../security/svrcore
-%{__make} \
+%{__make} -C security/coreconf
+%{__make} -C security/svrcore \
        CFLAGS="%{rpmcflags} -I. -I/usr/include/nspr -I/usr/include/nss"
-cd ../..
 # end svrcore
 
 cd directory/c-sdk
@@ -92,7 +89,7 @@ cd directory/c-sdk
        --enable-optimize \
        --disable-debug
 
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch %{x8664} ppc64 ia64 s390x
 USE_64=1
 export USE_64
 %endif
@@ -107,9 +104,10 @@ export USE_64
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_includedir},%{_libdir}}/mozldap
 
-install dist/lib/lib*ldap* $RPM_BUILD_ROOT%{_libdir}
+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 -d $RPM_BUILD_ROOT%{_datadir}/mozldap%{_sysconfdir}
 cd directory/c-sdk/ldap
@@ -140,8 +138,8 @@ done
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -150,14 +148,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(644,root,root,755)
+%dir %{_libdir}/mozldap
 %attr(755,root,root) %{_libdir}/mozldap/ldap*
 
 %files devel
 %defattr(644,root,root,755)
-%{_pkgconfigdir}/mozldap.pc
+%attr(755,root,root) %{_libdir}/lib*.so
 %{_includedir}/mozldap
+%{_pkgconfigdir}/mozldap.pc
 %{_datadir}/mozldap
-%{_libdir}/lib*.so
 
 %files static
 %defattr(644,root,root,755)