--- a/ChangeLog	Fri Mar 05 10:34:54 2010 +0000
+++ b/ChangeLog	Fri Mar 05 23:57:55 2010 +0000
@@ -1,3 +1,25 @@
+2010-03-05  Brian Cameron  <[email protected]>
+
+	* SFEsdl-mixer.spec, base-specs/sdl-mixer.spec,
+	  patches/sdl-mixer-01-cflags.diff: Bump to 1.2.11, rework patch.
+	* SFEsdl-image.spec: Add %ifarch around install of arch specific
+	  pkgconfig files.
+	* SFEmenu-cache.spec: Bump to 0.3.2.
+	* SFElxterminal.spec: Bump to 0.1.7.
+	* SFElxpanel.spec: Bump to 0.5.5.
+	* patches/lxsession-02-fixcrash.diff: Fix additional crashing issue.
+	* base-specs/abiword.spec:
+	* SFEaspell.spec: Add -xannotate=no to CXXFLAGS and CFLAGS to address
+	  doo bug #9720 & bugster #6823945/#6865312.
+	* base-specs/aspell.spec:  Add "-I ./m4" to aclocal call, and do not
+	  reset CFLAGS.
+	* base-specs/boost.spec: Add "-d+2 -q" to the call to bjam for better
+	  debug output.  With this option the specific compile/link commands
+	  are echoed to the log which makes debugging build problems more
+	  simple.  The -q option makes the build stop immediately if the build
+	  fails rather than continuing the build and finding out about the
+	  failure at the end.
+
 2010-03-05  Milan Jurik <[email protected]>
 
 	* SFEgnochm.spec: add missing intl in build process

--- a/SFEaspell.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/SFEaspell.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -36,14 +36,24 @@
 %aspell.prep -d %name-%version
 
 %build
+# Need to set LD_NOEXEC_64 and add -xannotate=no to deal with doo bug #9720.
+# and bugster #6823945/#6865312.
+export LD_NOEXEC_64=1
+export CFLAGS="%optflags -xannotate=no"
+export CXXFLAGS="%cxx_optflags -staticlib=stlport4 -xannotate=no"
 export CXX="$CXX -norunpath"
-export CFLAGS="%optflags"
 export LDFLAGS="%_ldflags -lCrun -lm"
-export CXXFLAGS="%cxx_optflags -staticlib=stlport4"
 export MSGFMT="/usr/bin/msgfmt"
 %aspell.build -d %name-%version
 
 %install
+
+# Need to set LD_NOEXEC_64 and add -xannotate=no to deal with doo bug #9720.
+# and bugster #6823945/#6865312.
+export LD_NOEXEC_64=1
+export CFLAGS="%optflags -xannotate=no"
+export CXXFLAGS="%cxx_optflags -staticlib=stlport4 -xannotate=no"
+
 %aspell.install -d %name-%version
 mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libdir}/aspell/
 rm -rf $RPM_BUILD_ROOT%{_bindir}
@@ -70,6 +80,9 @@
 %{_includedir}/*
 
 %changelog
+* Fri Mar 05 2010 - Brian Cameron <brian.cameron>
+- Need to set LD_NOEXEC_64 and add -xannotate=no to deal with doo bug #9720.
+  and bugster #6823945/#6865312.
 * Sat Apr 21 2007 - [email protected]
 - Added BuildConflicts: SUNWaspell
 * Tue Mar 13 2007 - [email protected]

--- a/SFElxpanel.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/SFElxpanel.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -9,7 +9,7 @@
 
 Name:                    SFElxpanel
 Summary:                 LXDE desktop panel
-Version:                 0.5.4.1
+Version:                 0.5.5
 Source:                  http://downloads.sourceforge.net/lxde/lxpanel-%{version}.tar.gz
 URL:                     http://sourceforge.net/projects/lxde/
 Requires: SFEmenu-cache
@@ -89,6 +89,8 @@
 %endif
 
 %changelog
+* Fri Mar 05 2010 - [email protected]
+- Bump to 0.5.5.
 * Mon Feb 15 2010 - [email protected]
 - Bump to 0.5.4.1
 * Thu Aug 06 2009 - [email protected]

--- a/SFElxterminal.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/SFElxterminal.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -9,7 +9,7 @@
 
 Name:                    SFElxterminal
 Summary:                 LXDE terminal emulator
-Version:                 0.1.6
+Version:                 0.1.7
 Source:                  http://downloads.sourceforge.net/lxde/lxterminal-%{version}.tar.gz
 URL:                     http://sourceforge.net/projects/lxde/
 
@@ -79,6 +79,8 @@
 %endif
 
 %changelog
+* Fri Mar 05 2010 - [email protected]
+- Bump to 0.1.7.
 * Tue Aug 04 2009 - [email protected]
 - Bump to 0.1.6.
 * Thr Mar 19 2009 - [email protected]

--- a/SFEmenu-cache.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/SFEmenu-cache.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -7,7 +7,7 @@
 
 Name:                    SFEmenu-cache
 Summary:                 LXDE menu cache
-Version:                 0.3.0
+Version:                 0.3.2
 Source:                  http://downloads.sourceforge.net/lxde/menu-cache-%{version}.tar.gz
 URL:                     http://sourceforge.net/projects/lxde/
 
@@ -61,6 +61,8 @@
 %{_includedir}/*
 
 %changelog
+* Fri Mar 05 2010 - [email protected]
+- Bump to 0.3.2.
 * Mon Feb 15 2010 - [email protected]
 - Bump to 0.3.0.
 * Tue Aug 04 2009 - [email protected]

--- a/SFEsdl-image.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/SFEsdl-image.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -104,17 +104,23 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/SDL_image.pc
+%ifarch amd64 sparcv9
 %dir %attr (0755, root, bin) %{_libdir}/amd64
 %dir %attr (0755, root, other) %{_libdir}/amd64/pkgconfig
 %{_libdir}/amd64/pkgconfig/SDL_image.pc
+%endif
+%if %arch_sse2
 %dir %attr (0755, root, bin) %{_libdir}/pentium_pro+mmx
 %dir %attr (0755, root, other) %{_libdir}/pentium_pro+mmx/pkgconfig
 %{_libdir}/pentium_pro+mmx/pkgconfig/SDL_image.pc
+%endif
 
 %changelog
+* Fri Mar 05 2010 - Brian Cameron  <[email protected]>
+- Add %ifarch around the packaging of architecture specific pkgconfig files.
 * Tue Mar 02 2010 - [email protected]
 - Update packaging
-* Tue Jun  5 2007 - Doug Scott
+* Tue Jun 05 2007 - Doug Scott
 - Change to isabuild
 * Sun Apr 01 2007 Jeff Cai
 - Initial version

--- a/SFEsdl-mixer.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/SFEsdl-mixer.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -99,13 +99,27 @@
 
 %files devel
 %defattr(-,root,bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/SDL/
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%endif
+%if %arch_sse2
+%dir %attr (0755, root, other) %{_libdir}/%{sse2_arch}/pkgconfig
+%{_libdir}/%{sse2_arch}/pkgconfig/*.pc
+%endif
 
 %changelog
-* Sun Dec  7 2008 - Gilles Dauphin
+* Fri Mar 05 2010 - Brian Cameron  <[email protected]>
+- Add pkgconfig files.
+* Sun Dec 07 2008 - Gilles Dauphin
 - Can't find DOC README CHANGE etc...
-* Tue Jun  5 2007 - Doug Scott
+* Tue Jun 05 2007 - Doug Scott
 - Change to isabuild
 * Sun Apr 22 2007 - Doug Scott
 - Initial version

--- a/base-specs/aspell.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/base-specs/aspell.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -73,7 +73,7 @@
 fi
 
 libtoolize --force
-aclocal $ACLOCAL_FLAGS
+aclocal $ACLOCAL_FLAGS -I ./m4
 autoconf
 automake -a -c -f
 
@@ -84,7 +84,7 @@
 %endif
 
 # For some reason, wide curses fails on Solaris, so disabling for now.
-CFLAGS="$RPM_OPT_FLAGS" ./configure \
+./configure \
     --prefix=%{_prefix} \
     --sysconfdir=/etc \
     --mandir=%{_mandir} \

--- a/base-specs/boost.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/base-specs/boost.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -95,7 +95,7 @@
 
 # Build Boost
 BJAM=`find tools/jam/src -name bjam -a -type f`
-$BJAM --v2 -j$CPUS -sBUILD="release <threading>single/multi" \
+$BJAM --v2 -d+2 -q -j$CPUS -sBUILD="release <threading>single/multi" \
   $BOOST_BJAM_ICU_PATH $BOOST_BJAM_LAYOUT --user-config=user-config.jam \
   release stage
 

--- a/base-specs/sdl-mixer.spec	Fri Mar 05 10:34:54 2010 +0000
+++ b/base-specs/sdl-mixer.spec	Fri Mar 05 23:57:55 2010 +0000
@@ -9,7 +9,7 @@
 
 Name:			sdl-image
 Summary: 		Sound Mixer library for SDL
-Version:		1.2.8
+Version:		1.2.11
 Source: 		%{src_url}/%{src_name}-%{version}.tar.gz
 Patch1:			sdl-mixer-01-cflags.diff
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
@@ -21,7 +21,7 @@
 %build
 export PATH=%{_bindir}:$PATH
 export CFLAGS="%optflags" 
-export LDFLAGS="%_ldflags" 
+export LDFLAGS="%_ldflags -lm" 
 ./configure --prefix=%{_prefix}                 \
             --bindir=%{_bindir}                 \
             --mandir=%{_mandir}                 \
@@ -29,10 +29,10 @@
             --libexecdir=%{_libexecdir}         \
             --sysconfdir=%{_sysconfdir}
 
-make
+gmake
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+gmake install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -40,6 +40,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Mar 05 2010 - [email protected]
+- Bump to 1.2.11.
 * Wed Aug 15 2007 - [email protected]
 - Bump to 1.2.8
 * Tue Jun  5 2007 - Doug Scott

--- a/patches/lxsession-02-fixcrash.diff	Fri Mar 05 10:34:54 2010 +0000
+++ b/patches/lxsession-02-fixcrash.diff	Fri Mar 05 23:57:55 2010 +0000
@@ -1,14 +1,23 @@
---- lxsession-0.4.1/lxsession/autostart.c-orig	2010-02-15 23:44:17.201266230 -0600
-+++ lxsession-0.4.1/lxsession/autostart.c	2010-02-15 23:45:07.606075883 -0600
+--- lxsession-0.4.1/lxsession/autostart.c-orig	2010-03-05 07:10:32.825349483 -0600
++++ lxsession-0.4.1/lxsession/autostart.c	2010-03-05 07:10:41.969033034 -0600
 @@ -189,7 +189,7 @@ static void launch_autostart_file( const
              for( i = 0; i < n; ++i )
              {
                  /* Only start this program if we are in the "OnlyShowIn" list */
 -                if( 0 == strcmp( de_name, only_show_in[ i ] ) )
-+                if(de_name != NULL &&  0 == strcmp( de_name, only_show_in[ i ] ) )
++                if( de_name != NULL && 0 == strcmp( de_name, only_show_in[ i ] ) )
                      break;
              }
              if( i >= n )    /* our session name is not found in the list */
+@@ -210,7 +210,7 @@ static void launch_autostart_file( const
+ 				for( i = 0; i < n; ++i )
+ 				{
+ 					/* Only start this program if we are in the "OnlyShowIn" list */
+-					if( 0 == strcmp( de_name, not_show_in[ i ] ) )
++					if( de_name != NULL && 0 == strcmp( de_name, not_show_in[ i ] ) )
+ 						break;
+ 				}
+ 				if( i < n )    /* our session name is found in the "NotShowIn" list */
 --- lxsession-0.4.1/lxsession/lxsession.c-orig	2010-02-15 23:41:33.847859021 -0600
 +++ lxsession-0.4.1/lxsession/lxsession.c	2010-02-15 23:43:36.050621365 -0600
 @@ -311,7 +311,9 @@ int main(int argc, char** argv)

--- a/patches/sdl-mixer-01-cflags.diff	Fri Mar 05 10:34:54 2010 +0000
+++ b/patches/sdl-mixer-01-cflags.diff	Fri Mar 05 23:57:55 2010 +0000
@@ -1,8 +1,11 @@
-diff -ur SDL_mixer-1.2.7-orig/Makefile.in SDL_mixer-1.2.7/Makefile.in
---- SDL_mixer-1.2.7-orig/Makefile.in	2006-05-17 13:08:04.000000000 +0700
-+++ SDL_mixer-1.2.7/Makefile.in	2007-05-27 13:20:23.008533882 +0700
-@@ -57,10 +57,10 @@
- 	$(SHELL) $(auxdir)/mkinstalldirs $@
+--- SDL_mixer-1.2.11/Makefile.in-orig	2010-03-05 06:45:22.451925678 -0600
++++ SLD_mixer-1.2.11/Makefile.in	2010-03-05 06:45:44.741189765 -0600
+@@ -72,13 +72,13 @@ $(objects):
+ @PLAYMUS_DEPENDS@
+ 
+ $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
+-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
  
  $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
 -	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
@@ -12,5 +15,5 @@
 -	$(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
 +	$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET)
  
- .PHONY: all depend install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist
- depend:
+ install: all install-hdrs install-lib #install-bin
+ install-hdrs: