SPECS: mozldap.spec - use x8664 macro, missing dir

qboosh qboosh at pld-linux.org
Tue May 9 11:48:46 CEST 2006


Author: qboosh                       Date: Tue May  9 09:48:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use x8664 macro, missing dir

---- Files affected:
SPECS:
   mozldap.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/mozldap.spec
diff -u SPECS/mozldap.spec:1.9 SPECS/mozldap.spec:1.10
--- SPECS/mozldap.spec:1.9	Tue May  2 13:59:49 2006
+++ SPECS/mozldap.spec	Tue May  9 11:48:41 2006
@@ -67,17 +67,14 @@
 %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
@@ -93,7 +90,7 @@
 	--enable-optimize \
 	--disable-debug
 
-%ifarch x86_64 ppc64 ia64 s390x
+%ifarch %{x8664} ppc64 ia64 s390x
 USE_64=1
 export USE_64
 %endif
@@ -142,8 +139,8 @@
 %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)
@@ -152,14 +149,15 @@
 
 %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)
@@ -172,6 +170,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/05/09 09:48:41  qboosh
+- use x8664 macro, missing dir
+
 Revision 1.9  2006/05/02 11:59:49  zbyniu
 - more static libs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mozldap.spec?r1=1.9&r2=1.10&f=u



More information about the pld-cvs-commit mailing list