--- a/CBE_README	Wed Jul 22 13:39:14 2009 +0000
+++ b/CBE_README	Thu Jul 23 10:43:32 2009 +0000
@@ -29,7 +29,7 @@
    For GNOME/SFE: ant, GNU m4, autoconf, automake, libtool, bison,
             GNU coreutils, GNU diff, flex, GNU gettext, GNU make,
             subversion
-   Optional tools: rsync cvs
+   Optional tools: rsync cvs git
 
    Tool Versions:
 
@@ -52,6 +52,7 @@
    - rsync: 3.0.4
    - svn: 1.4.6
    - yasm: 0.7.1
+   - git: 1.6.3.3
 
 
 What's new in this release (@CBE_VERSION@)?
@@ -121,6 +122,7 @@
 	gcc4
 	sexp
 	ss12
+	ss12_1
 
    Note: you cannot pass arguments after source <file> when using the csh
    shell.  You can start a subshell, though:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CBEgit.spec	Thu Jul 23 10:43:32 2009 +0000
@@ -0,0 +1,143 @@
+#
+# spec file for package CBEgit
+#
+# Copyright 2008 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+
+%include CBE.inc
+%define perl_version 5.8.4
+
+Name:			CBEgit
+Version:		1.6.3.3
+Group:			system/cbe
+License:		GPLv2
+Distribution:		Desktop CBE
+Vendor:			Sun Microsystems, Inc.
+Summary:		Desktop CBE: Git is a free & open source, distributed version control system
+Source:			http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2
+URL:			http://git-scm.com/
+BuildRoot:		%{_tmppath}/%{name}-%{version}-build
+SUNW_BaseDir:		%{_prefix}
+SUNW_Category:          CBE,KDE,JDS,application
+SUNW_Rev:		%{?cbe_version}%{?!cbe_version:0.0}
+%include default-depend.inc
+Requires:		SUNWlibC
+BuildRequires:		%make_dep
+Requires: SUNWzlib
+Requires: SUNWsshu
+Requires: SUNWopenssl-libraries
+Requires: SUNWlexpt
+Requires: SUNWbash
+Requires: SUNWperl584core
+
+%if %(pkginfo -q SUNWgnu-diffutils && echo 1 || echo 0)
+Requires: SUNWgnu-diffutils
+%else
+Requires: CBEdiff
+%endif
+
+
+%prep
+%setup -q -n git-%version
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+     CPUS=1
+fi
+
+gmake configure
+./configure \
+        --prefix=%{_prefix} \
+        --mandir=%{_mandir} \
+        --libexecdir=%{_libexecdir} \
+        --with-openssl=/usr/sfw \
+        --without-curl \
+        --with-expat \
+        --without-iconv \
+        --without-tcltk \
+        --with-perl=/usr/perl5/bin/perl
+gmake all
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+gmake install DESTDIR=$RPM_BUILD_ROOT INSTALL=install
+
+# move perl stuff to vendor_perl
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/perl5/vendor_perl/%{perl_version}
+mv $RPM_BUILD_ROOT%{_libdir}/site_perl/*.pm $RPM_BUILD_ROOT%{_prefix}/perl5/vendor_perl/%{perl_version}
+
+# remove unwanted stuff like .packlist and perllocal.pod
+rm -r $RPM_BUILD_ROOT%{_libdir}/site_perl
+rm $RPM_BUILD_ROOT%{_libdir}/*-solaris-*/perllocal.pod
+rmdir $RPM_BUILD_ROOT%{_libdir}/*-solaris-*
+rmdir $RPM_BUILD_ROOT%{_libdir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (0755, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/git*
+%dir %attr (0755, root, bin) %{_libexecdir}
+%{_libexecdir}/git-core
+%dir %attr (0755, root, sys) %{_datadir}
+%dir %{_datadir}/git-core
+%dir %{_datadir}/git-core/templates
+%{_datadir}/git-core/templates/branches
+%{_datadir}/git-core/templates/description
+%{_datadir}/git-core/templates/info
+%dir %{_datadir}/git-core/templates/hooks
+%defattr (0644, root, bin)
+%{_datadir}/git-core/templates/hooks/*
+%defattr (0755, root, bin)
+%dir %attr (0755, root, bin) %{_mandir}
+%dir %attr (0755, root, bin) %{_mandir}/man?
+%{_mandir}/man?/*
+%dir %attr (0755, root, bin) %{_prefix}/perl5
+%dir %attr (0755, root, bin) %{_prefix}/perl5/vendor_perl
+%dir %attr (0755, root, bin) %{_prefix}/perl5/vendor_perl/%{perl_version}
+%{_prefix}/perl5/vendor_perl/%{perl_version}/*
+
+%changelog
+* Thu Jul 22 2009 - [email protected]
+- adopt for CBE
+- bump to 1.6.3.3
+- use Sun Studio
+- build base functionality only
+- build without GUI and docs
+* Tue Oct 21 2008 - [email protected]
+- Bump to 1.6.0.2
+* Tue Sep 02 2008 - [email protected]
+- Bump to 1.6.0.1
+- Remove upstreamed patch git-03-tr.diff
+* Wed Apr 23 2008 - [email protected]
+- Add patch3 to fix bisect problem with non-GNU tr
+* Thu Mar 13 2008 - [email protected]
+- s/SFEcurl/SUNWcurl
+* Fri feb 22 2008 - [email protected]
+- Add patch git-02-fixshell.diff to fix a build problem caused
+  by a script that requires bash.
+* Thu Feb 21 2008 - [email protected]
+- Bump to 1.5.4.2
+* Thu Dec 06 2007 - [email protected]
+- Bump to 1.5.3.7.
+* Sun Nov 18 2007 - [email protected]
+- Change LDFLAGS to work for gcc.
+* Tue Sep 18 2007 - [email protected]
+- Bump to 1.5.3.
+* Thu Jul 05 2007 - [email protected]
+- fixing hook templates permisions
+* Tue Jul 03 2007 - [email protected]
+- changing version to 1.5.2.2 and declaring new files
+* Fri Jun 22 2007 - [email protected]
+- make it build with either SUNWgnu-diffutils or SFEdiffutils
+* Tue Feb 13 2007 - [email protected]
+- finish Erwann's spec
+* Tue Feb 13 2007 - [email protected]
+- Initial spec

--- a/CBErsync.spec	Wed Jul 22 13:39:14 2009 +0000
+++ b/CBErsync.spec	Thu Jul 23 10:43:32 2009 +0000
@@ -15,7 +15,7 @@
 Distribution:		Desktop CBE
 Vendor:			Sun Microsystems, Inc.
 Summary:		Desktop CBE: Rsync
-Source:			http://samba.anu.edu.au/ftp/rsync/rsync-%{version}.tar.gz
+Source:			http://samba.anu.edu.au/ftp/rsync/src/rsync-%{version}.tar.gz
 URL:			http://samba.anu.edu.au/rsync/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 SUNW_BaseDir:		%{_prefix}
@@ -52,6 +52,8 @@
 %{_mandir}
 
 %changelog
+* Thu Jul 23 2009 - <[email protected]>
+- fix source location
 * Wed Oct 08 2008 - [email protected]
 - Bump to 3.0.4
 * Wed Jun 11 2008  <[email protected]>

--- a/ChangeLog	Wed Jul 22 13:39:14 2009 +0000
+++ b/ChangeLog	Thu Jul 23 10:43:32 2009 +0000
@@ -1,3 +1,12 @@
+2009-07-23 Lukas (Luc) Oboril <[email protected]>
+	* cbe-install: add git as optional tool
+	* CBEgit.spec: build only base functionality
+	many big and great projects like GNOME, QT, X.org, VLC and others
+	are using git as its DVCS.
+	* cbe-install: fix Sun Studio 12 Update 1 environment
+	* CBE_README: add git and Sun Stduio12 Update 1 note
+	* CBErsync.spec: fix source tarball location
+	
 2009-07-22 Lukas (Luc) Oboril <[email protected]>
 	* CBEflex.spec: bump to 2.5.3
 	* cbe-install: add support for Sun Studio 12 update1

--- a/cbe-install	Wed Jul 22 13:39:14 2009 +0000
+++ b/cbe-install	Thu Jul 23 10:43:32 2009 +0000
@@ -39,7 +39,7 @@
 # Modules needed for building KDE:
 KDE_MODULES="ant m4 autoconf automake libtool bison coreutils diff flex gettext subversion gnuawk gnused cmake make yasm"
 # Not needed for either GNOME or KDE, but useful to have:
-OPT_MODULES="rsync cvs"
+OPT_MODULES="rsync cvs git"
 # SFE has the same deps as GNOME
 SFE_MODULES=$GNOME_MODULES
 install_kde=no
@@ -96,6 +96,7 @@
 #ALT_cmake=SUNWcmake
 # In SXCE build107 SUNWant = ant 1.7.1
 #ALT_ant=SUNWant
+ALT_git=SUNWgit
 
 # default cbe install location
 cbe_prefix=${CBE_PREFIX:-/opt/dtbld}