--- a/ChangeLog	Sat Nov 17 17:21:29 2007 +0000
+++ b/ChangeLog	Sun Nov 18 13:33:43 2007 +0000
@@ -1,3 +1,39 @@
+2007-11-18  Damien Carbery <[email protected]>
+
+	* SFEdillo.spec: Remove SUNWGtku (gtk 1.x) dependency to get module
+	  to build.
+	* SFEabiword.spec: Enable building with either SUNWaspell or SFEaspell.
+	  Also add support for building on Indiana systems.
+	* SFErdesktop.spec: Remove SUNWopenssl-commands dependency to get module
+	  to build.
+	* SFEtracker.spec: Add support for building on Indiana systems.
+	* SFEircii.spec: Fix %files.
+	* SFEgnome-power-manager.spec: Fix %files.
+	* SFElibgsf.spec: Add support for building on Indiana systems.
+	* SFEhpoj.spec: Change LDFLAGS to work for gcc.
+	* SFEgnome-gvfs.spec: Add support for building on Indiana systems. Add
+	  changes for gvfs 0.0.2.
+	* SFEcoreutils.spec: Add BuildConflicts SUNWgnu-coreutils, a package
+	  that is available on Indiana systems.
+	* SFElibatomic-ops.spec: Change LDFLAGS to work for gcc.
+	* SFEkmflcomp.spec: Add support for building on Indiana systems.
+	* SFEscim-tables.spec: Enable building with either SUNWgnu-gettext or
+	  SFEgettext.
+	* SFElibiconv.spec: Add l10n package.
+	* SFEliberea.spec: Add support for building on Indiana systems.
+	* SFEscim-hangul.spec: Enable building with either SUNWgnu-gettext or
+	  SFEgettext.
+	* SFEscim.spec: Add support for building on Indiana systems.
+	* SFEspeex.spec: Add BuildConflicts SUNWspeex.
+	* SFEgkrellm.spec: Enable building with either SUNWgnu-gettext or
+	  SFEgettext.
+	* SFEdangerdeep.spec: Add support for building on Indiana systems.
+	* SFEscim-anthy.spec: Enable building with either SUNWgnu-gettext or
+	  SFEgettext.
+	* include/Solaris.inc: Copy from spec-files repository, to include
+	  Indiana support.
+	* patches/dangerdeep-02-backtrace.diff: Rework.
+
 2007-11-17  Damien Carbery <[email protected]>
 
 	* SFEw3m.spec: Add support for building on Indiana systems.

--- a/SFEabiword.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEabiword.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -10,6 +10,8 @@
 
 %include Solaris.inc
 
+%define SUNWaspell      %(/usr/bin/pkginfo -q SUNWaspell && echo 1 || echo 0)
+
 %use abiword = abiword.spec
 
 Name:               SFEabiword
@@ -25,7 +27,6 @@
 Requires:           SUNWpng
 Requires:           SUNWlxml
 Requires:           SUNWlibpopt
-Requires:           SUNWaspell
 Requires:           SUNWgnome-spell
 Requires:           SUNWfontconfig
 Requires:           SUNWperl584core
@@ -34,9 +35,22 @@
 BuildRequires:      SUNWpng-devel
 BuildRequires:      SUNWlxml-devel
 BuildRequires:      SUNWlibpopt-devel
-BuildRequires:      SUNWaspell-devel
 BuildRequires:      SUNWgnome-spell-devel
 BuildRequires:      SFElibfribidi-devel
+%if %SUNWaspell
+Requires:           SUNWaspell
+BuildRequires:      SUNWaspell-devel
+%else
+BuildRequires: SFEaspell-devel
+Requires: SFEaspell
+%endif
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
+
 
 %package devel
 Summary:       %{summary} - development files
@@ -53,6 +67,10 @@
 %build
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+export CXXFLAGS="$CXXFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
 export RPM_OPT_FLAGS="$CFLAGS"
 %abiword.build -d %name-%version
 
@@ -88,5 +106,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Enable building with either SUNWaspell or SFEaspell. Also add support for
+  building on Indiana systems.
 * Wed Sep 26 2007 - [email protected]
 - Initial spec

--- a/SFEcoreutils.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEcoreutils.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -15,6 +15,7 @@
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
+BuildConflicts: SUNWgnu-coreutils
 Requires: SUNWlibms
 Requires: SUNWtexi
 Requires: SUNWpostrun
@@ -153,6 +154,9 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add BuildConflicts SUNWgnu-coreutils, a package that is available on Indiana
+  systems.
 * Fri Jul 13 2007 - [email protected]
 - Bump to 6.9
 * Sat Apr 21 2007 - [email protected]

--- a/SFEdangerdeep.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEdangerdeep.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -55,11 +55,17 @@
     CPUS=1
 fi
 export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
+%if %option_with_fox
+export CFLAGS="$CFLAGS -I/usr/X11/include"
+%endif
+export LDFLAGS="%arch_ldadd %ldadd ${EXTRA_LDFLAGS}"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export MSGFMT="/usr/bin/msgfmt"
 export CXX=/usr/gnu/bin/g++
-export CXXFLAGS="-O3 -fno-omit-frame-pointer"
+export CXXFLAGS="%gcc_cxx_optflags"
+%if %option_with_fox
+export CXXFLAGS="$CXXFLAGS -I/usr/X11/include"
+%endif
 export LD_OPTIONS="-i -zdirect -L/usr/gnu/lib -R/usr/gnu/lib"
 
 rm -rf $RPM_BUILD_ROOT
@@ -88,6 +94,8 @@
 %{_datadir}/dangerdeep
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems.
 * Thu Nov 15 2007 - [email protected]
 - Bump to 0.3.0. Enable building with SFElibsdl or SFEsdl.
 * Mon Apr 23 2006 - [email protected]

--- a/SFEdillo.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEdillo.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -16,7 +16,7 @@
 BuildRoot:              %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-Requires:	SUNWGtku
+#Requires:	SUNWGtku
 
 %package root
 Summary:       %{summary} - / filesystem
@@ -68,5 +68,7 @@
 %{_sysconfdir}
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Remove SUNWGtku (gtk 1.x) dependency to get module to build.
 * Mon Apr 30 2007 - [email protected]
 - Initial version

--- a/SFEgkrellm.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEgkrellm.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -5,6 +5,8 @@
 
 %include Solaris.inc
 
+%define SUNWgnugettext      %(/usr/bin/pkginfo -q SUNWgnu-gettext && echo 1 || echo 0)
+
 Name:                SFEgkrellm
 Summary:             Popular (ubiquitous) Gtk-based system monitor
 Version:             2.2.10
@@ -13,7 +15,13 @@
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
 
-BuildRequires: SFEgettext
+%if %SUNWgnugettext
+BuildRequires: SUNWgnu-gettext-devel
+Requires: SUNWgnu-gettext
+%else
+BuildRequires: SFEgettext-devel
+Requires: SFEgettext
+%endif
 
 # Guarantee X/GTK/freetype environment, concisely (hopefully)
 BuildRequires: SUNWGtku
@@ -106,6 +114,8 @@
 %{_libdir}/pkgconfig/gkrellm.pc
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Enable building with either SUNWgnu-gettext or SFEgettext.
 * Fri Apr 20 2007 - [email protected]
 - Added SFW libs (LDFLAGS,LD_OPTIONS)
 * Mon Mar 19 2007 - [email protected]

--- a/SFEgnome-gvfs.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEgnome-gvfs.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -27,6 +27,12 @@
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWdbus-devel
 BuildRequires: SFEgio-devel
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -41,6 +47,9 @@
 %build
 # -D_XPG4_2 is to get CMSG_SPACE declaration in <sys/socket.h>.
 export CFLAGS="%optflags -D_XPG4_2 -D__EXTENSIONS__"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags"
 %gvfs.build -d %name-%version
@@ -48,9 +57,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %gvfs.install -d %name-%version
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/gvfs/modules/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/libgvfscommon.la
+rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/libgvfsdbus.la
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
 
@@ -60,12 +68,13 @@
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/gvfs-daemon*
+%{_libdir}/gvfsd*
 %{_libdir}/libgvfscommon.so*
 %{_libdir}/gio/modules/*.so*
-%{_libdir}/gvfs/modules/*.so*
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/dbus-1/services/gvfs-daemon.service
+%dir %attr (0755, root, bin) %{_includedir}
+%{_includedir}/*
 
 %files root
 %defattr (-, root, sys)
@@ -74,6 +83,8 @@
 
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems. Add changes for gvfs 0.0.2.
 * Fri Nov 09 2007 - [email protected]
 - Add SFEgio to Requires, add SFEgio-devel to BuildRequires.
 * Thu Nov 07 2007 - [email protected]

--- a/SFEgnome-power-manager.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEgnome-power-manager.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -175,6 +175,7 @@
 %{_datadir}/icons/hicolor/48x48/apps/*
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
 
 
 %files root
@@ -190,6 +191,8 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Fix %files.
 * Thu Nov 08 2007 - [email protected]
 - Ensure doc dir is not installed
 * Wed Nov 7 2007 - [email protected]

--- a/SFEhpoj.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEhpoj.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -36,7 +36,7 @@
 export CXX=g++
 export CFLAGS="%{gcc_optflags}"
 export CXXFLAGS="%{gcc_cxx_optflags}"
-export LDFLAGS="%{_ldflags}"
+export LDFLAGS="%arch_ldadd %ldadd ${EXTRA_LDFLAGS}"
 ./configure --prefix=%{_prefix}		\
 	    --bindir=%{_bindir}		\
 	    --mandir=%{_mandir}		\
@@ -85,5 +85,7 @@
 %{_includedir}/*
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Change LDFLAGS to work for gcc.
 * Fri Jun  8 2007 - [email protected]
 - Initial version

--- a/SFEindent.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEindent.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -78,6 +78,8 @@
 export LDFLAGS="%_ldflags"
 
 libtoolize --copy --force
+glib-gettextize --copy --force
+intltoolize --copy --force --automake
 aclocal
 autoconf -f
 automake -a -c -f

--- a/SFEircii.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEircii.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -60,8 +60,12 @@
 %defattr (-, root, bin)
 %{_bindir}
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/ircii
+%{_datadir}/irc
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Fix %files.
 * Fri Aug  3 2007 - [email protected]
 - Initial spec

--- a/SFEkmflcomp.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEkmflcomp.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -34,6 +34,9 @@
 fi
 
 export CFLAGS="%optflags"
+%if %option_with_fox
+export CFLAGS="$CFLAGS -I/usr/X11/include"
+%endif
 export LDFLAGS="%_ldflags"
 
 libtoolize --copy --force
@@ -76,5 +79,7 @@
 %{_includedir}
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems.
 * Thu Jul 26 2007 - [email protected]
 - Initial spec

--- a/SFElibatomic-ops.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFElibatomic-ops.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -36,7 +36,7 @@
 
 export CC=gcc
 export CFLAGS="-O4 -fno-omit-frame-pointer"
-export LDFLAGS="%_ldflags"
+export LDFLAGS="%arch_ldadd %ldadd ${EXTRA_LDFLAGS}"
 
 libtoolize --copy --force
 aclocal
@@ -73,5 +73,7 @@
 %{_includedir}
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Change LDFLAGS to work for gcc.
 * Sun Aug 12 2007 - [email protected]
 - Initial spec

--- a/SFElibgsf.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFElibgsf.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -27,6 +27,12 @@
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-vfs-devel 
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -55,6 +61,9 @@
 
 %build
 export CFLAGS="%optflags -I/usr/gnu/include"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="%_ldflags -L/usr/gnu/lib -R/usr/gnu/lib"
 
@@ -124,9 +133,7 @@
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/*
 %dir %attr (0755, root, sys) %{_datadir}
-%if %{!?_without_gtk_doc:1}%{?_without_gtk_doc:0}
 %{_datadir}/gtk-doc
-%endif
 
 %files root
 %defattr (-, root, sys)
@@ -141,6 +148,8 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems.
 * Wed Oct 17 2007 - [email protected]
 - add /usr/gnu to CFLAGS/LDFLAGS
 * Thu May 03 2007 - [email protected]

--- a/SFElibiconv.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFElibiconv.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -20,6 +20,14 @@
 %include default-depend.inc
 Requires: %name
 
+%if %build_l10n
+%package l10n
+Summary:                 %{summary} - l10n files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:                %{name}
+%endif
+
 %prep
 %setup -q -n libiconv-%version
 
@@ -47,6 +55,14 @@
 rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 rm $RPM_BUILD_ROOT%{_libdir}/charset.alias
 
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale
+#rm -r $RPM_BUILD_ROOT%{_datadir}/gnome/help/gnome-commander/[a-z]*
+#rm -r $RPM_BUILD_ROOT%{_datadir}/omf/gnome-commander/*-[a-z]*.omf
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,7 +87,16 @@
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/*
 
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add l10n package.
 * Sun Apr 21 2007 - Doug Scott
 - Added -L/usr/gnu/lib -R/usr/gnu/lib
 * Mon Mar 12 2007 - Eric Boutilier

--- a/SFEliferea.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEliferea.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -22,6 +22,12 @@
 Requires: SUNWpostrun
 Requires: %{name}-root
 Requires: SUNWbash
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
 
 %package root
 Summary:                 %{summary} - / filesystem
@@ -46,6 +52,9 @@
     CPUS=1
 fi
 export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
 export CXXFLAGS="%cxx_optflags"
 export RPM_OPT_FLAGS="$CFLAGS"
 export LDFLAGS="-R/usr/lib/firefox"
@@ -136,6 +145,8 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems.
 * Thu Jun 22 2006 - [email protected]
 - bump to 1.0.15
 - rename to SFEliferea

--- a/SFErdesktop.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFErdesktop.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -15,8 +15,6 @@
 
 %include default-depend.inc
 
-Requires: SUNWopenssl-commands
-
 %prep
 %setup -q -n rdesktop-%version
 
@@ -51,7 +49,9 @@
 %{_datadir}/*
 
 %changelog
-*
+* Sun Nov 18 2007 - [email protected]
+- Remove SUNWopenssl-commands dependency to get module to build.
+
 * Mon Dec  4 2006 - Thomas Wagner
 - Upgrade from 1.4.1 to 1.5.0
 * 

--- a/SFEscim-anthy.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEscim-anthy.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -8,6 +8,7 @@
 %define	src_name scim-anthy
 %define	src_url http://iij.dl.sourceforge.jp/scim-imengine/25404
 
+%define SUNWgnugettext      %(/usr/bin/pkginfo -q SUNWgnu-gettext && echo 1 || echo 0) 
 Name:                SFEscim-anthy
 Summary:             SCIM anthy IMEngine
 Version:             1.2.4
@@ -21,9 +22,14 @@
 BuildRequires: SFElibanthy-devel
 Requires: SFElibanthy
 %if %build_l10n
+%if %SUNWgnugettext
+BuildRequires: SUNWgnu-gettext-devel
+Requires: SUNWgnu-gettext
+%else
 BuildRequires: SFEgettext-devel
 Requires: SFEgettext
 %endif
+%endif
 
 %package devel
 Summary:                 %{summary} - development files
@@ -107,5 +113,7 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Enable building with either SUNWgnu-gettext or SFEgettext.
 * Sat Jul 28 2007 - [email protected]
 - Initial spec

--- a/SFEscim-hangul.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEscim-hangul.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -8,6 +8,8 @@
 %define	src_name scim-hangul
 %define	src_url	http://nchc.dl.sourceforge.net/sourceforge/scim
 
+%define SUNWgnugettext      %(/usr/bin/pkginfo -q SUNWgnu-gettext && echo 1 || echo 0)
+
 Name:                SFEscim-hangul
 Summary:             SCIM Hangul IMEngine
 Version:             0.3.1
@@ -20,9 +22,14 @@
 BuildRequires: SFElibhangul-devel
 Requires: SFElibhangul
 %if %build_l10n
+%if %SUNWgnugettext
+BuildRequires: SUNWgnu-gettext-devel
+Requires: SUNWgnu-gettext
+%else
 BuildRequires: SFEgettext-devel
 Requires: SFEgettext
 %endif
+%endif
 
 %package devel
 Summary:                 %{summary} - development files
@@ -100,5 +107,7 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Enable building with either SUNWgnu-gettext or SFEgettext.
 * Sat Jul 28 2007 - [email protected]
 - Initial spec

--- a/SFEscim-tables.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEscim-tables.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -8,6 +8,8 @@
 %define	src_name scim-tables
 %define	src_url	http://nchc.dl.sourceforge.net/sourceforge/scim
 
+%define SUNWgnugettext      %(/usr/bin/pkginfo -q SUNWgnu-gettext && echo 1 || echo 0)
+
 Name:                SFEscim-tables
 Summary:             SCIM tables IMEngine
 Version:             0.5.7
@@ -19,9 +21,14 @@
 BuildRequires: SFEscim-devel
 Requires: SFEscim
 %if %build_l10n
+%if %SUNWgnugettext
+BuildRequires: SUNWgnu-gettext-devel
+Requires: SUNWgnu-gettext
+%else
 BuildRequires: SFEgettext-devel
 Requires: SFEgettext
 %endif
+%endif
 
 %package devel
 Summary:                 %{summary} - development files
@@ -102,5 +109,7 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Enable building with either SUNWgnu-gettext or SFEgettext.
 * Sat Jul 28 2007 - [email protected]
 - Initial spec

--- a/SFEscim.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEscim.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -24,6 +24,12 @@
 Requires: SUNWgnome-panel
 BuildRequires: SUNWgnome-base-libs-devel
 BuildRequires: SUNWgnome-panel-devel
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
 
 %package devel
 Summary:                 %{summary} - development files
@@ -42,6 +48,10 @@
 
 %build
 export CFLAGS="%optflags"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+export CXXFLAGS="$CXXFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
 export LDFLAGS="-lsocket"
 ./bootstrap
 ./configure --prefix=%{_prefix}                 \
@@ -94,5 +104,7 @@
 %{_includedir}/*
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems.
 * Thu Jul 26 2007 - [email protected]
 - Initial spec, borrowed from opensolaris input-method project

--- a/SFEspeex.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEspeex.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -20,7 +20,7 @@
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
 # Tag definitions
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
-Name:         	%{src_name}
+Name:         	SFE%{src_name}
 Summary:      	Speex: A Free Codec For Free Speech
 Version:      	%{src_version}
 Release:      	%{pkg_release}
@@ -33,6 +33,7 @@
 
 #Requires:      
 #BuildRequires: 
+BuildConflict: SUNWspeex
 
 %description 
 Speex is an Open Source/Free Software  patent-free audio compression format designed for speech. The Speex Project aims to lower the barrier of entry for voice applications by providing a free alternative to expensive proprietary speech codecs. Moreover, Speex is well-adapted to Internet applications and provides useful features that are not present in most other codecs.
@@ -101,5 +102,7 @@
 
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add BuildConflicts SUNWspeex.
 * 2007.Aug.11 - <shivakumar dot gn at gmail dot com>
 - Initial spec.

--- a/SFEtracker.spec	Sat Nov 17 17:21:29 2007 +0000
+++ b/SFEtracker.spec	Sun Nov 18 13:33:43 2007 +0000
@@ -8,7 +8,7 @@
 %use tracker = tracker.spec
 
 Name:           SFEtracker
-Summary:        tracker.summary
+Summary:        %{tracker.summary}
 Version:        %{default_pkg_version}
 SUNW_BaseDir:   %{_basedir}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -25,7 +25,13 @@
 BuildRequires:  SUNWdbus-devel
 BuildRequires:  SFEgmime-devel
 BuildRequires:  SFEsqlite-devel
-BUildRequires:  SUNWgamin-devel
+BuildRequires:  SUNWgamin-devel
+%if %option_with_gnu_iconv
+Requires: SUNWgnu-libiconv
+Requires: SUNWgnu-gettext
+%else
+Requires: SUNWuiu8
+%endif
 #Additional recommended packages
 Requires:       SUNWgnome-media
 Requires:       SUNWpng
@@ -78,6 +84,9 @@
 %build
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export CFLAGS="%optflags -I/usr/gnu/include"
+%if %option_with_gnu_iconv
+export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib -lintl"
+%endif
 export LDFLAGS="%_ldflags -L/usr/gnu/lib -R/usr/gnu/lib"
 export RPM_OPT_FLAGS="$CFLAGS"
 %tracker.build -d %name-%version
@@ -160,8 +169,10 @@
 %endif
 
 %changelog
+* Sun Nov 18 2007 - [email protected]
+- Add support for building on Indiana systems
 * Fri Nov 02 2007 - [email protected]
-- Spilit into base/tracker.spec
+- Split into base/tracker.spec
 - Remove GNOMOE 2.19/2.20 install compatible part.
 - Add package -extension to install firefox/thunderbird extensions.
 * Fri Sep 28 2007 - [email protected]

--- a/include/Solaris.inc	Sat Nov 17 17:21:29 2007 +0000
+++ b/include/Solaris.inc	Sun Nov 18 13:33:43 2007 +0000
@@ -5,6 +5,7 @@
 #
 
 %include prod.inc
+%include options.inc
 
 SUNW_Pkg_AllZones:         false
 SUNW_Pkg_Hollow:           false
@@ -12,24 +13,6 @@
 
 %define cc_is_gcc %(test "x`basename $CC`" = xgcc && echo 1 || echo 0)
 
-# Command line configurable build options:
-
-# use --with-build-l10n to build the SUNWfoo-l10n packages
-# default: no l10n packages
-%define build_l10n %{?_with_l10n:1}%{?!_with_l10n:0}
-
-# use --with-debug to build binaries with debug info (-g) and not to strip
-# them.
-# default: don't include debug info and strip the binaries (strip -x)
-%define debug_build %{?_with_debug:1}%{?!_with_debug:0}
-
-# use --without-gtk-doc to disable building gtk-docs (it takes quite
-# a while to build them)
-# default: build gtk-doc API docs
-%define gtk_doc_option %{?!_without_gtk_doc:--enable-gtk-doc}%{?_without_gtk_doc:--disable-gtk-doc}
-
-# end of command line configurable build options
-
 %define is_nevada %(test `uname -r` = 5.11 && echo 1 || echo 0)
 %define is_s10    %(test `uname -r` = 5.10 && echo 1 || echo 0)
 %define _patch_options --fuzz=0 --unified
@@ -59,14 +42,17 @@
 %define base_arch i386
 %endif
 
+%if %option_with_gnu_iconv
+%define arch_ldadd -Wl,-zignore -R/usr/gnu/lib -lgnuintl -lgnuiconv
+%else
 %define arch_ldadd
+%endif
 %define ldadd
 
 %if %debug_build
 %define _ldflags           %arch_ldadd %ldadd ${EXTRA_LDFLAGS}
 %else
 %define _ldflags           %arch_ldadd %ldadd -Wl,-zignore -Wl,-zcombreloc -Wl,-Bdirect ${EXTRA_LDFLAGS}
-%define gcc_ldflags        %arch_ldadd %ldadd ${EXTRA_LDFLAGS}
 %endif
 
 %define gcc_picflags -fPIC -DPIC
@@ -93,9 +79,11 @@
 %define _pkg_config_path   %{_libdir}/pkgconfig
 
 # ChangeLog:
-# 2007-10-17  Laszlo (Laca) Peter  <[email protected]>
-# - define gcc_ldflags such that they don't include solaris ld specific
-#   flags like -Bdirect
+# 2007-09-28  Laszlo (Laca) Peter  <[email protected]>
+# - copy arch_ldadd definition from base.inc
+# 2007-09-27  Laszlo (Laca) Peter  <[email protected]>
+# - move configurable build options to options.inc and include
+#   options.inc
 # 2007-04-05  Laszlo (Laca) Peter  <[email protected]>
 # - fix _ldflags so that it includes the architecture specific flags
 # 2007-03-15  Laszlo (Laca) Peter  <[email protected]>

--- a/patches/dangerdeep-02-backtrace.diff	Sat Nov 17 17:21:29 2007 +0000
+++ b/patches/dangerdeep-02-backtrace.diff	Sun Nov 18 13:33:43 2007 +0000
@@ -1,9 +1,9 @@
 diff -ur dangerdeep-0.2.0-orig/src/faulthandler.h dangerdeep-0.2.0/src/faulthandler.h
 --- dangerdeep-0.2.0-orig/src/faulthandler.h	2006-10-13 01:16:09.000000000 +0700
 +++ dangerdeep-0.2.0/src/faulthandler.h	2007-04-23 13:18:28.911356853 +0700
-@@ -25,7 +25,11 @@
+@@ -43,7 +43,11 @@
  
- #ifndef WIN32
+ #else	//non-WIN32-MacOSX
  
 +// backtrace support is yet to be added to Open Solaris
 +// *** FIXME *** need to check for support in SConstruct
@@ -13,7 +13,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <cxxabi.h>      // Needed for __cxa_demangle
-@@ -37,6 +41,7 @@
+@@ -57,6 +61,7 @@
  
  inline void print_stack_trace()
  {