--- a/ChangeLog	Sat Aug 21 13:14:43 2010 +0000
+++ b/ChangeLog	Tue Aug 24 01:34:29 2010 +0000
@@ -1,3 +1,12 @@
+2010-08-23  Brian Cameron  <[email protected]>
+
+	* SFEbzr.spec: Bump to 2.2.0.
+	* SFElxde-common.spec, patches/lxde-common-02-config.diff:  Add patch
+	  to set up default icon configuration so that icons show up in the
+	  panel menus.
+	* SFElxinput.spec, patches/lxinput-01-Werror.diff: Bump to 0.3.0 and
+	  add patch needed for building.
+
 2010-08-21 Milan Jurik <[email protected]>
 
 	* SFEssmtp.spec: fix of permissions, included in SFE repository
@@ -12,7 +21,8 @@
           SUNWgnu-mp SUNWgnu-mpfr as default.
           stop and exit 1 if the link /usr/gnu/bin/cc exists. 
           search ld-wrapper from PATH 
-          workaround IPS bug that ever prints BASEdir as "/"  for SFEgmp and SFEmpfr 
+          workaround IPS bug that ever prints BASEdir as "/"  for SFEgmp and
+	  SFEmpfr 
         * encumbered/SFEmplayer-snap.spec:  rename configure switch 
           --enable-faad-external to --enable-faad. Use gmake in %build 
           instead make (makefile syntax error)

--- a/SFEbzr.spec	Sat Aug 21 13:14:43 2010 +0000
+++ b/SFEbzr.spec	Tue Aug 24 01:34:29 2010 +0000
@@ -6,15 +6,15 @@
 %include Solaris.inc
 
 %define python_version 2.6
-%define tarball_version 2.0.0
+%define tarball_version 2.2.0
 
 Name:			SFEbzr
 Summary:		Bazaar Source Code Management System
 License:		GPL
 Group:			system/dscm
-Version:		2.0.0
+Version:		2.2.0
 Distribution:		spec-files-extra
-Source:                 http://launchpad.net/bzr/2.0/%{version}/+download/bzr-%{tarball_version}.tar.gz
+Source:                 http://launchpad.net/bzr/2.2/%{version}/+download/bzr-%{tarball_version}.tar.gz
 URL:			http://bazaar-vcs.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 SUNW_BaseDir:		%{_prefix}
@@ -61,6 +61,8 @@
 %{_mandir}/man1/bzr.1
 
 %changelog
+* Mon Aug 23 2010 - [email protected]
+- Bump to 2.2.0.
 * Sun Oct 11 2009 - [email protected]
 - Bump to 2.0.0, and use Python 2.6.
 * Fri Jul 31 2009 - [email protected]

--- a/SFElxde-common.spec	Sat Aug 21 13:14:43 2010 +0000
+++ b/SFElxde-common.spec	Tue Aug 24 01:34:29 2010 +0000
@@ -10,6 +10,7 @@
 Version:                 0.5.0
 Source:                  http://downloads.sourceforge.net/lxde/lxde-common-%{version}.tar.gz
 Patch1:                  lxde-common-01-startlxde.diff
+Patch2:                  lxde-common-02-config.diff
 URL:                     http://sourceforge.net/projects/lxde/
 
 SUNW_BaseDir:            %{_basedir}
@@ -24,6 +25,7 @@
 %prep
 %setup -q -n lxde-common-%version
 %patch1 -p1
+%patch2 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
@@ -67,6 +69,9 @@
 %{_sysconfdir}/xdg/*
 
 %changelog
+* Thu Aug 19 2010 - [email protected]
+- Add patch lxde-common-02-config.diff to set up configuration so the icons
+  show up in the menus.
 * Mon Feb 15 2010 - [email protected]
 - Bump to 0.5.0.
 * Thu Aug 06 2009 - [email protected]

--- a/SFElxinput.spec	Sat Aug 21 13:14:43 2010 +0000
+++ b/SFElxinput.spec	Tue Aug 24 01:34:29 2010 +0000
@@ -7,7 +7,7 @@
 
 Name:                    SFElxinput
 Summary:                 LXInput (Kbd & mouse config)
-Version:                 0.1.1
+Version:                 0.3.0
 Source:                  http://nchc.dl.sourceforge.net/sourceforge/lxde/lxinput-%{version}.tar.gz
 URL:                     http://sourceforge.net/projects/lxde/
 
@@ -78,6 +78,8 @@
 %endif
 
 %changelog
+* Tue Aug 17 2010 - [email protected]
+- Bump to 0.3.0.
 * Tue Aug 04 2009 - [email protected]
 - Bump to 0.1.1
 * Wed May 27 2009 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/lxde-common-02-config.diff	Tue Aug 24 01:34:29 2010 +0000
@@ -0,0 +1,11 @@
+--- lxde-common-0.5.0/desktop.conf-orig	2010-08-19 11:45:03.885190852 -0500
++++ lxde-common-0.5.0/desktop.conf	2010-08-19 11:46:04.232481247 -0500
+@@ -3,7 +3,7 @@ window_manager=openbox-lxde
+ 
+ [GTK]
+ sNet/ThemeName=Clearlooks
+-sNet/IconThemeName=nuoveXT2
++sNet/IconThemeName=gnome
+ sGtk/FontName=Sans 10
+ iGtk/ToolbarStyle=3
+ iGtk/ButtonImages=1

--- a/patches/lxinput-01-Werror.diff	Sat Aug 21 13:14:43 2010 +0000
+++ b/patches/lxinput-01-Werror.diff	Tue Aug 24 01:34:29 2010 +0000
@@ -1,12 +1,10 @@
 --- lxinput-0.1/src/Makefile.am.orig	2009-05-27 15:12:12.418335582 +0800
 +++ lxinput-0.1/src/Makefile.am	2009-05-27 15:14:34.816676663 +0800
-@@ -1,8 +1,7 @@
- INCLUDES = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"/lxinput\" \
+@@ -3,7 +3,6 @@ INCLUDES = \
  	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
--	@GTK_CFLAGS@ \
+ 	$(GTK_CFLAGS) \
+ 	$(XLIB_CFLAGS)
 -	-Werror-implicit-function-declaration
-+	@GTK_CFLAGS@
  
  bin_PROGRAMS = lxinput