--- a/CBE_README	Sun Nov 15 05:16:36 2009 +0000
+++ b/CBE_README	Tue Dec 15 10:45:17 2009 +0000
@@ -34,7 +34,7 @@
    Tool Versions:
 
    - ant: 1.7.1
-   - autoconf: 2.61
+   - autoconf: 2.63
    - automake: 1.10.1
    - bison: 2.3
    - cmake: 2.4.8
@@ -50,7 +50,7 @@
    - m4: 1.4.9
    - make: 3.81
    - rsync: 3.0.4
-   - svn: 1.4.6
+   - svn: 1.6.6
    - yasm: 0.7.1
    - git: 1.6.3.3
 

--- a/CBEautoconf.spec	Sun Nov 15 05:16:36 2009 +0000
+++ b/CBEautoconf.spec	Tue Dec 15 10:45:17 2009 +0000
@@ -31,6 +31,11 @@
 %endif
 BuildRequires: %make_dep
 
+%if %(test `uname -r` = 5.10 && echo 1 || echo 0)
+BuildRequires: CBEm4
+%endif
+
+
 %description
 GNU autoconf for the Desktop build environment
 
@@ -62,6 +67,8 @@
 %{_mandir}/*
 
 %changelog
+* Wed Dec 2 2009 <[email protected]>
+- autconf needs newer GNU M4 on Solaris 10
 * Sat Nov 15 2009 <[email protected]>
 - bump to 2.63 as same as Opensolaris has
 * Wed Jun 11 2008  <[email protected]>

--- a/CBEsubversion.spec	Sun Nov 15 05:16:36 2009 +0000
+++ b/CBEsubversion.spec	Tue Dec 15 10:45:17 2009 +0000
@@ -8,23 +8,16 @@
 
 %include CBE.inc
 
-%define version_apr 1.2.11
-%define version_apr_util 1.2.10
-%define version_neon 0.25.5
-%define apache_site http://archive.apache.org/dist/apr
 Name:			CBEsvn
-Version:		1.4.6
+Version:		1.6.6
 License:		Apache,LGPL,BSD
 Group:			system/cbe
 Distribution:		Desktop CBE
 Vendor:			Sun Microsystems, Inc.
 Summary:		Desktop CBE: Subversion SCM
 Source:			http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
-Source1:		%apache_site/apr-%{version_apr}.tar.bz2
-Source2:		%apache_site/apr-util-%{version_apr_util}.tar.bz2
-Source3:		http://www.webdav.org/neon/neon-%{version_neon}.tar.gz
+Source1:		http://subversion.tigris.org/downloads/subversion-deps-%{version}.tar.gz
 URL:			http://subversion.tigris.org/
-Patch1:                 subversion-01-libneon.la.diff
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 SUNW_BaseDir:		%{_prefix}
 SUNW_Category:          CBE,KDE,JDS,application
@@ -46,20 +39,19 @@
 
 %prep
 %setup -q -n subversion-%{version}
-bzcat %SOURCE1 | tar xf -
-mv apr-%{version_apr} apr
-bzcat %SOURCE2 | tar xf -
-mv apr-util-%{version_apr_util} apr-util
-gzcat %SOURCE3 | tar xf -
-mv neon-%{version_neon} neon
-%patch1 -p1 -b .patch01
+cd .. && gzcat %SOURCE1 | tar xf -
 
 %build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
 export CFLAGS="%{optflags} -I/usr/sfw/include -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 export CPPFLAGS="-I/usr/sfw/include"
 export LD=/usr/ccs/bin/ld
 export LDFLAGS="-L%{_prefix}/lib -R%{_prefix}/lib -L/usr/sfw/lib -R/usr/sfw/lib -L$RPM_BUILD_ROOT%{_libdir}"
-export PATH=$PATH:/usr/apache2/bin
+
 ./autogen.sh
 aclocal -I build/ac-macros
 autoconf
@@ -69,20 +61,31 @@
     --disable-static \
     --without-apxs \
     --with-pic \
-    --with-installbuilddir=%{_datadir}/apr/build \
     --disable-mod-activation \
     --mandir=%{_mandir} \
     --with-ssl \
-    --infodir=%{_infodir}
+    --infodir=%{_infodir} \
+    --enable-javahl \
+    --with-jdk="/usr/java" \
+    --enable-runtime-module-search \
+    --disable-mod-activation \
+    --without-berkeley-db
 
-gmake
+gmake 
+
+#-j$CPUS
 
 %install
 rm -rf $RPM_BUILD_ROOT
 gmake install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_infodir}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+rm -rf $RPM_BUILD_ROOT%{_datadir}/apr
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{_prefix}/build-1
 
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lib*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,10 +99,6 @@
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/apr
-%dir %attr (0755, root, other) %{_datadir}/doc
-%{_datadir}/doc/*
-%attr (-, root, other) %{_datadir}/locale
 %dir %attr (0755, root, bin) %{_mandir}
 %dir %attr (0755, root, bin) %{_mandir}/man1
 %{_mandir}/man1/*

--- a/ChangeLog	Sun Nov 15 05:16:36 2009 +0000
+++ b/ChangeLog	Tue Dec 15 10:45:17 2009 +0000
@@ -1,3 +1,8 @@
+2009-12-15 Lukas (Luc) Oboril <[email protected]>
+	* CBEsubversion.spec: bump to 1.6.6
+	* CBEautoconf.spec: add CBEm4 on Solaris10
+	* CBE_README: fix versions
+	
 2009-11-15 Lukas (Luc) Oboril <[email protected]>
 	* CBEm4: bump to 1.4.12, as same as Opensolaris has
 	* CBEautoconf.spec: bump to 2.63 as same as Opensolaris has