packages: root/root.spec - BR: python-modules, which - progress is made but...

[sparky]

Author: sparky                       Date: Fri Jan 22 15:36:13 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- BR: python-modules, which
- progress is made but still does not build on x86_64

---- Files affected:
packages/root:
   root.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/root/root.spec
diff -u packages/root/root.spec:1.23 packages/root/root.spec:1.24
--- packages/root/root.spec:1.23	Fri Jan 22 14:13:38 2010
+++ packages/root/root.spec	Fri Jan 22 16:36:08 2010
@@ -35,7 +35,10 @@
 BuildRequires:	pcre-devel >= 3.9
 BuildRequires:	postgresql-devel
 BuildRequires:	python-devel >= 1:2.6
+BuildRequires:	python-modules
+BuildRequires:	sed >= 4.0
 BuildRequires:	unixODBC-devel
+BuildRequires:	which
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXft-devel
@@ -44,6 +47,17 @@
 # TODO???: oracle, rfio, shift, gfal, G4Navigator, apmon, pythia, dcap, chirp, glite, gapi, afterimage, srp
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	config_target	linux
+%ifarch %{x8664}
+%define	config_target	linuxx8664gcc
+%endif
+%ifarch ppc
+%define	config_target	linuxppcgcc
+%endif
+%ifarch ppc64
+%define	config_target	linuxppc64gcc
+%endif
+
 %description
 An object-oriented data analysis environment.
 
@@ -53,9 +67,10 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+sed '/check_library/s@ \\$@ %{_libdir} \\@' -i configure
 
 %build
-./configure linux \
+./configure %{config_target} \
 	--prefix="%{_prefix}" \
 	--disable-builtin-afterimage \
 	--disable-builtin-ftgl \
@@ -92,6 +107,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2010/01/22 15:36:08  sparky
+- BR: python-modules, which
+- progress is made but still does not build on x86_64
+
 Revision 1.23  2010/01/22 13:13:38  lisu
 - up to 5.26.00a
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/root/root.spec?r1=1.23&r2=1.24&f=u