SPECS: xalan-c.spec - killed x86-centrism

qboosh qboosh at pld-linux.org
Tue Oct 9 21:27:18 CEST 2007


Author: qboosh                       Date: Tue Oct  9 19:27:18 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- killed x86-centrism

---- Files affected:
SPECS:
   xalan-c.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/xalan-c.spec
diff -u SPECS/xalan-c.spec:1.35 SPECS/xalan-c.spec:1.36
--- SPECS/xalan-c.spec:1.35	Mon Oct  8 15:19:44 2007
+++ SPECS/xalan-c.spec	Tue Oct  9 21:27:13 2007
@@ -1,5 +1,4 @@
 # $Revision$, $Date$
-#
 %define		_ver	%(echo %{version} | tr . _)
 Summary:	XML parser
 Summary(pl.UTF-8):	Analizator składniowy XML-a
@@ -59,9 +58,9 @@
 %patch0 -p1
 %patch1 -p1
 
-%ifarch %{x8664}
-sed -i s#/lib/icu/Makefile.inc#/lib64/icu/Makefile.inc#	\
-    c/src/xalanc/Utils/Makefile.in
+%if "%{_lib}" != "lib"
+sed -i s#/lib/icu/Makefile.inc#/%{_lib}/icu/Makefile.inc# \
+	c/src/xalanc/Utils/Makefile.in
 %endif
 
 rm -rf c/{xdocs,samples}/CVS
@@ -74,11 +73,11 @@
 export XALAN_USE_ICU=true
 
 ./runConfigure \
-	-P /usr \
+	-P %{_prefix} \
 	-p linux \
 	-c "%{__cc}" \
 	-x "%{__cxx}" \
-%ifarch %{x8664}
+%ifarch %{x8664} alpha ppc64 s390x sparc64
 	-b 64 \
 %else
 	-b 32 \
@@ -102,8 +101,8 @@
 install -d $RPM_BUILD_ROOT%{_libdir}
 install -d $RPM_BUILD_ROOT%{_includedir}
 
-%ifarch %{x8664}
-mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}
+%if "%{_lib}" != "lib"
+mv $RPM_BUILD_ROOT%{_prefix}/lib/* $RPM_BUILD_ROOT%{_libdir}
 %endif
 
 %clean
@@ -134,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2007/10/09 19:27:13  qboosh
+- killed x86-centrism
+
 Revision 1.35  2007/10/08 13:19:44  kosmo
 - fixed build on x86_64
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xalan-c.spec?r1=1.35&r2=1.36&f=u



More information about the pld-cvs-commit mailing list