diff -r da688f850c6d -r b48a2cd3a7b1 xbase/xbase.spec --- a/xbase/xbase.spec Fri Jan 16 20:54:43 2009 +0100 +++ b/xbase/xbase.spec Fri Jan 16 20:56:21 2009 +0100 @@ -36,7 +36,7 @@ Group: Database License: GPL Version: %{V_xbase} -Release: 20080101 +Release: 20090106 # list of sources Source0: http://www.rekallrevealed.org/packages/xbase-%{V_xbase}.tgz @@ -75,9 +75,25 @@ %prep %setup -q -c %setup -q -T -D -a 1 - %patch -p0 + ( cd xbase-%{V_xbase} + %patch -p0 + ) || exit $? + %{l_shtool} subst \ + -e "s;/usr\(/lib/libncurses\)\.so;%{l_prefix}/\1.a;" \ + xbsql-%{V_xbsql}/configure + %{l_shtool} subst \ + -e 's;^\(libxbsql_la_LDFLAGS = -lxbase\);\1 @LDFLAGS@;' \ + -e 's;^\(xql_LDADD =\) \(-lxbase\);\1 @LDFLAGS@ \2;' \ + xbsql-%{V_xbsql}/xbsql/Makefile.in %build + platcomp="%{l_platform -t}" + case "%{l_platform -t}" in + sun4[uv]-sunos* ) platcomp="sparc-solaris" ;; + *-sunos* ) platcomp="i386-solaris" ;; + *-linux* ) platcomp="i386-linux" ;; + *-freebsd* ) platcomp="i386-freebsd" ;; + esac ( cd xbase-%{V_xbase} CC="%{l_cc}" \ CXX="%{l_cxx}" \ @@ -86,6 +102,7 @@ CPPFLAGS="%{l_cppflags}" \ LDFLAGS="%{l_ldflags}" \ ./configure \ + --host=$platcomp \ --prefix=%{l_prefix} \ --disable-shared %{l_make} %{l_mflags -O}