--- a/CBEflex.spec	Fri Jul 10 13:16:22 2009 +0000
+++ b/CBEflex.spec	Wed Jul 22 13:39:14 2009 +0000
@@ -9,7 +9,7 @@
 %include CBE.inc
 
 Name:			CBEflex
-Version:		2.5.33
+Version:		2.5.35
 License:		BSD
 Group:			system/cbe
 Distribution:		Desktop CBE
@@ -60,6 +60,8 @@
 %{_datadir}/*
 
 %changelog
+* Wed Jul 22 2009 <[email protected]>
+- bump 20 2.5.35
 * Wed Jun 11 2008  <[email protected]>
 - update rev, gmake depedency, use c99flag
 * Mon Apr 14 2008 - [email protected]

--- a/CBEsubversion.spec	Fri Jul 10 13:16:22 2009 +0000
+++ b/CBEsubversion.spec	Wed Jul 22 13:39:14 2009 +0000
@@ -11,7 +11,7 @@
 %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
 License:		Apache,LGPL,BSD
@@ -20,8 +20,8 @@
 Vendor:			Sun Microsystems, Inc.
 Summary:		Desktop CBE: Subversion SCM
 Source:			http://subversion.tigris.org/downloads/subversion-%{version}.tar.bz2
-Source1:		http://www.apache.org/dist/apr/apr-%{version_apr}.tar.bz2
-Source2:		http://www.apache.org/dist/apr/apr-util-%{version_apr_util}.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
 URL:			http://subversion.tigris.org/
 Patch1:                 subversion-01-libneon.la.diff
@@ -112,6 +112,8 @@
 
 
 %changelog
+* Wed Jul 22 2009 <[email protected]>
+- change source location of apr and apr-utils
 * Wed Jun 11 2008  <[email protected]>
 - update rev, gmake depedency
 * Mon Apr 21 2008 - <[email protected]>

--- a/ChangeLog	Fri Jul 10 13:16:22 2009 +0000
+++ b/ChangeLog	Wed Jul 22 13:39:14 2009 +0000
@@ -1,30 +1,37 @@
+2009-07-22 Lukas (Luc) Oboril <[email protected]>
+	* CBEflex.spec: bump to 2.5.3
+	* cbe-install: add support for Sun Studio 12 update1
+		       specify patch level of Sun Studio version
+	* Changelog: fix my previous records there ;)
+	* CBEsubversion.spec: change source tarball location of apr and apr-util
+
 2009-07-10 Lukas (Luc) Oboril <[email protected]>
-	* bump yasm to 0.8.0
+	* CBEyasm.spec: bump to 0.8.0
 
 2009-05-05 Lukas (Luc) Oboril <[email protected]>
-	* bump to 2.6.4 (fix many issues, see cmake changelog)
+	* CBEcmake.spec: bump to 2.6.4 (fix many issues, see cmake changelog)
 
 2009-04-28 Lukas (Luc) Oboril <[email protected]>
-	* bump pkgbuild to latest version 1.3.98.4
-	* add Sun Studio Express 03/09 as known compiler
+	* cbe-install: bump pkgbuild to latest version 1.3.98.4
+		      add Sun Studio Express 03/09 as known compiler
 
 2009-03-16 Lukas (Luc) Oboril <[email protected]>
-	* bump cmake to 2.6.3 (fix many issues)
-	* bump pkgbuild to latest stable release 1.3.3
-	
+	* CBEcmake.spec: bump to 2.6.3 (fix many issues)
+	* cbe-install: pkgbuild to latest stable release 1.3.3
+
 2009-02-20 Lukas (Luc) Oboril <[email protected]>
-	* add FindGettext patch for cmake 2.6.2
-	* define alternative for ant, but leave comment in
+	* CBEcmake.spec: add FindGettext patch for cmake 2.6.2
+	* cbe-install: define alternative for ant, but leave comment in
 
 2009-01-18  Lukas (Luc) Oboril <[email protected]>
 
-	* add ant to KDE group, newer version of ant is needed for QTJambi
-	* define alternatives for GNU sed, GNU awk, cmake, gettext
-	* minor changes in CBE_README
+	* cbe-install: add ant to KDE group, newer version of ant is needed for QTJambi
+		      define alternatives for GNU sed, GNU awk, cmake, gettext
+	* CBE_README: minor changes
 
 2009-01-12  Lukas (Luc) Oboril <[email protected]>
 
-	* CBEcmake.spec - bump to 2.6.2 (KDE 4.2)
+	* CBEcmake.spec: - bump to 2.6.2 (KDE 4.2)
 
 2008-12-14  Albert Lee  <[email protected]>
 
@@ -32,9 +39,9 @@
 	* CBErsync.spec: Bump to 3.0.4
 
 2008-07-18  Lukas (Luc) Oboril <[email protected]>
-	
-	* CBEcmake.spec - fix typo
-	* CBEgnuawk.spec - remove locale dir, prevent to build error
+
+	* CBEcmake.spec: - fix typo
+	* CBEgnuawk.spec: - remove locale dir, prevent to build error
 	on Nevada >= 92
 
 2008-07-11  Lukas (Luc) Oboril <[email protected]>
@@ -74,7 +81,7 @@
 
 	* CBEenv.spec: look for m4 in various directories; test if ginstall
 	  and gdiff exist
-	* cbe-install: implement quiet install 
+	* cbe-install: implement quiet install
 
 2008-06-19  Laszlo (Laca) Peter  <[email protected]>
 
@@ -240,7 +247,7 @@
 	 - CBErsync.spec
 	 - CBEyasm.spec
 	 - default-depend.inc
-	* CBErsync.spec: use %include default-depend.inc instead of 
+	* CBErsync.spec: use %include default-depend.inc instead of
 	  Requires direction.
 
 2008-04-21  Laszlo (Laca) Peter  <[email protected]>

--- a/cbe-install	Fri Jul 10 13:16:22 2009 +0000
+++ b/cbe-install	Wed Jul 22 13:39:14 2009 +0000
@@ -291,6 +291,8 @@
 	id_CC_version=$(echo "$cc_version" | grep '^cc: Sun ' | sed -e 's/^cc: Sun.* C \([0-9][0-9.]*\) .*/\1/')
 	id_CC_rev=$(echo "$cc_version" | grep '^cc: Sun ' | sed -e 's/^cc: Sun.* C [0-9][0-9.]* \(.\)*/\1/')
 	id_CC_rev=$(echo "$id_CC_rev" | grep '^cc: Sun ' | sed -e 's/SunOS_[^ ]* //')
+	id_CC_date=$(echo "$cc_version" | grep '^cc: Sun ' | sed -e 's/^cc: Sun.* C [0-9][0-9.]* //' | sed -e 's/SunOS_[^ ]* //' | sed -e 's/[a-zA-Z]* [-0-9]* //')
+	id_CC_patch_level=$(echo "$cc_version" | grep '^cc: Sun ' | sed -e 's/^cc: Sun.* C [0-9][0-9.]* //' | sed -e 's/SunOS_[^ ]* //' | sed -e 's/[a-zA-Z]* //'| sed -e 's/[0-9]*\/[0-9]*\/[0-9]*//')
 	if [ "x$id_CC_version" = x5.7 ]; then
 	    id_CC_label='ss10'
 	    id_CC_release='Vulcan'
@@ -303,6 +305,10 @@
 	    id_CC_label='ss12'
 	    id_CC_release='Mars'	    
 	    id_CC_name='Sun Studio 12'
+	elif [ "x$id_CC_version" = x5.10 -a "x$id_CC_date" = x2009/06/03 ];then
+	    id_CC_label='ss12_1'
+	    id_CC_release='Ceres'
+	    id_CC_name='Sun Studio 12 Update 1'
 	elif [ "x$id_CC_version" = x5.10 ]; then
 	    id_CC_label='sexp'
 	    id_CC_release='Ceres'
@@ -357,7 +363,7 @@
     # FIXME: if CC = gcc, set CFLAGS to -std=c99
     msg "Locating compilers..."
     arch=$(uname -p)
-    known_compilers="/sgnome/onnv-tools/$arch/SS12/bin/cc /sgnome/onnv-tools/$arch/SS11/bin/cc /ws/onnv-tools/SUNWspro/SS12/bin/cc /ws/onnv-tools/SUNWspro/SS11/bin/cc /opt/SUNWspro/bin/cc /opt/SS12/SUNWspro/bin/cc /opt/Studio12/bin/cc /opt/SSX0903/bin/cc /usr/bin/cc /opt/SunStudioExpress/bin/cc /usr/bin/gcc /usr/sfw/bin/gcc /usr/gnu/bin/gcc"
+    known_compilers="/sgnome/onnv-tools/$arch/SS12/bin/cc /sgnome/onnv-tools/$arch/SS11/bin/cc /ws/onnv-tools/SUNWspro/SS12/bin/cc /ws/onnv-tools/SUNWspro/SS11/bin/cc /opt/SUNWspro/bin/cc /opt/SS12/SUNWspro/bin/cc /opt/Studio12/bin/cc /opt/SSX0903/bin/cc /opt/sunstudio12.1/bin/cc /usr/bin/cc /opt/SunStudioExpress/bin/cc /usr/bin/gcc /usr/sfw/bin/gcc /usr/gnu/bin/gcc"
     if [ "x$orig_CC" != x ]; then
 	if [ -x $orig_CC ]; then
 	    echo " $known_compilers " | grep " $orig_CC " > /dev/null || \
@@ -428,10 +434,18 @@
     ask_yes_no "Would you like to install Sun Studio Express (cc 5.10)?" \
 	ans_install_ssexp yes
     test "$ans_install_ssexp" = yes && pkg_try_install sunstudioexpress
+    # ask if sun studio 12 update 1 should be installed
+    ask_yes_no "Would you like to install Sun Studio 12 Update 1 (cc 5.10)?" \
+	ans_install_ss12_1 yes
+    test "$ans_install_ss12_1" = yes && pkg_try_install sunstudio12
 }
 
 check_compilers_kde () {
-    :
+    # KDE4 needs at least Sun Studio 12 with specific patch level (cc -V CC -V)
+    if [ "x$id_CC_label" = xss10 -o "x$id_CC_label" = xss11 -o "x$id_CC_label" = xssexp ]; then
+	log "Compiler id_CC_name is not suitable for building KDE4, please use Sun Studio 12 or Sun Studio 12 Update 1"
+	return 1
+    fi
 }
 
 # print the details of a compiler specified by its env config file