--- a/ChangeLog	Tue Jun 24 11:02:54 2008 +0000
+++ b/ChangeLog	Tue Jun 24 13:06:12 2008 +0000
@@ -1,3 +1,10 @@
+2008-06-24  Halton Huo <[email protected]>
+
+	* SFEgoffice.spec: Split base part to base/goffice.spec
+	* base-specs/goffice.spec: (new) Bump to 0.6.4
+	* base-specs/tsclient.spec: remove dup
+	* patches/goffice-01-no-sunmath-lib.diff: rework
+
 2008-06-24  Halton Huo <[email protected]>
 
 	* SFEgmp.spec: update URL and Source

--- a/SFEgoffice.spec	Tue Jun 24 11:02:54 2008 +0000
+++ b/SFEgoffice.spec	Tue Jun 24 13:06:12 2008 +0000
@@ -1,33 +1,41 @@
 #
-# spec file for package SFEgoffice 
+# spec file for package SFEgoffice
+#
+# includes module(s): goffice
+#
+# 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.
+#
+# Owner: halton
 #
 
 %include Solaris.inc
+
+%use goffice = goffice.spec
+
 Name:                    SFEgoffice
 Summary:                 goffice - Document centric set of APIs
-URL:                     http://www.gnome.org/
-Version:                 0.6.2
-Source:                  http://ftp.gnome.org/pub/GNOME/sources/goffice/0.6/goffice-%{version}.tar.gz
-Patch1:                  goffice-01-no-sunmath-lib.diff
+Version:                 %{goffice.version}
 SUNW_BaseDir:            %{_basedir}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 %include default-depend.inc
-Requires: SUNWlxml
-BuildRequires: SUNWlxml-devel
-Requires: SUNWpcre
-Requires: SUNWlibms
-Requires: SUNWgnome-base-libs
-BuildRequires: SUNWgnome-base-libs
-Requires: SUNWgnome-python-libs
-BuildRequires: SUNWgnome-python-libs-devel
-Requires: SUNWgnome-libs
-BuildRequires: SUNWgnome-libs-devel
-Requires: SUNWzlib
+Requires:       SUNWlxml
+Requires:       SUNWzlib
+Requires:       SUNWlibgsf
+Requires:       SUNWlibms
+Requires:       SUNWgnome-libs
+Requires:       SUNWgnome-base-libs
+Requires:       SUNWgnome-python-libs
+BuildRequires:  SUNWlxml-devel
+BuildRequires:  SUNWgnome-libs-devel
+BuildRequires:  SUNWgnome-base-libs-devel
+BuildRequires:  SUNWgnome-python-libs-devel
 %if %option_with_gnu_iconv
-Requires: SUNWgnu-libiconv
-Requires: SUNWgnu-gettext
+Requires:       SUNWgnu-libiconv
+Requires:       SUNWgnu-gettext
 %else
-Requires: SUNWuiu8
+Requires:       SUNWuiu8
 %endif
 
 %package devel
@@ -46,28 +54,29 @@
 %endif
 
 %prep
-%setup -q -n goffice-%version
-%patch1 -p1
+rm -rf %name-%version
+mkdir -p %name-%version
+%goffice.prep -d %name-%version
 
 %build
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export CFLAGS="%optflags"
-export CPPFLAGS="-I/usr/include/pcre"
 %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"
 
-./configure --prefix=%{_prefix}
-make
+%goffice.build -d %name-%version
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -r $RPM_BUILD_ROOT/%{_libdir}/*.la
+%goffice.install -d %name-%version
 
-%if %{build_l10n}
+%if %build_l10n
 %else
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/locale
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
 %endif
 
 %clean
@@ -75,26 +84,23 @@
 
 %files
 %defattr(-, root, bin)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO ABOUT-NLS
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/libgoffice*.so*
+%{_libdir}/goffice
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/goffice
 %dir %attr (0755, root, other) %{_datadir}/pixmaps
 %{_datadir}/pixmaps/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/libgoffice*.so*
-%{_libdir}/goffice
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%dir %attr (0755, root, bin) %{_datadir}/gtk-doc
-%dir %attr (0755, root, bin) %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/*
-
 
 %files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/*
-
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, other) %{_libdir}/pkgconfig
+%{_libdir}/pkgconfig/*
+%dir %attr (0755, root, sys) %dir %{_datadir}
+%{_datadir}/gtk-doc
 
 %if %build_l10n
 %files l10n
@@ -105,6 +111,9 @@
 
 
 %changelog
+* Tue Jun 24 2008 - [email protected]
+- Split base part to base/goffice.spec
+- Bump to 0.6.4
 * Mon Apr 14 2008 - [email protected]
 - Bump to 0.6.2, update dependencies
 * Tue Sep 04 2007  - Thomas Wagner

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base-specs/goffice.spec	Tue Jun 24 13:06:12 2008 +0000
@@ -0,0 +1,104 @@
+#
+# spec file for package goffice
+#
+# 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.
+#
+# Owner: halton
+#
+
+
+Name:           goffice
+Summary:        Set of document centric objects and utilities for glib/gtk
+License:        GPL
+Group:          System/Libraries
+Version:        0.6.4
+Release:        1
+Distribution:   Java Desktop System
+Vendor:         Sun Microsystems, Inc.
+URL:            http://www.gnome.org/
+Source:         http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.6/%{name}-%{version}.tar.gz
+# date:2008-06-24 owner:halton type:bug bugzilla:539930
+Patch1:         %{name}-01-no-sunmath-lib.diff
+BuildRoot:      %{tmpdir}/%{name}-%{version}-root
+
+BuildRequires:  automake1.8
+BuildRequires:  intltool
+BuildRequires: gtk+2-devel
+BuildRequires: libgnomeprint-devel >= 2.8.2
+BuildRequires: libgsf-devel >= 1:1.13.3
+BuildRequires: libglade2.0-devel
+BuildRequires: gtk-doc
+BuildRequires: perl-XML-Parser
+
+
+%description
+There are common operations for document centric applications that are
+conceptually simple, but complex to implement fully.
+    - plugins
+    - load/save documents
+    - undo/redo
+
+%prep
+%setup -q
+%patch1 -p1
+
+%build
+%ifos linux
+if [ -x /usr/bin/getconf ]; then
+  CPUS=`getconf _NPROCESSORS_ONLN`
+fi
+%else
+  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+%endif
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+  CPUS=1
+fi
+
+aclocal $ACLOCAL_FLAGS
+libtoolize --force
+intltoolize --force --automake
+autoheader
+automake -a -f -c --gnu
+autoconf
+
+CFLAGS="$RPM_OPT_FLAGS"
+./configure  --prefix=%{_prefix}                \
+             --libdir=%{_libdir}                \
+             --libexecdir=%{_libexecdir}        \
+             --datadir=%{_datadir}              \
+             --mandir=%{_mandir}                \
+             --sysconfdir=%{_sysconfdir}        \
+             %gtk_doc_option
+
+make -j $CPUS
+
+
+%install
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
+make -i install DESTDIR=$RPM_BUILD_ROOT
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%doc README NEWS AUTHORS BUGS ChangeLog MAINTAINERS
+%{_libdir}/lib*.so*
+%dir %{_libdir}/%name/
+%{_datadir}/%name
+%{_datadir}/pixmaps/%name
+%{_includedir}/libgoffice-0.3/
+%attr(644,root,root) %{_libdir}/lib*a
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gtk-doc/html/goffice/
+
+
+%changelog
+* Thu Jan 19 2008 - [email protected]
+- Initial version

--- a/base-specs/tsclient.spec	Tue Jun 24 11:02:54 2008 +0000
+++ b/base-specs/tsclient.spec	Tue Jun 24 13:06:12 2008 +0000
@@ -49,17 +49,6 @@
   CPUS=1
 fi
 
-%ifos linux
-if [ -x /usr/bin/getconf ]; then
-  CPUS=`getconf _NPROCESSORS_ONLN`
-fi
-%else
-  CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-%endif
-if test "x$CPUS" = "x" -o $CPUS = 0; then
-  CPUS=1
-fi
-
 aclocal $ACLOCAL_FLAGS
 libtoolize --force
 intltoolize --force --automake

--- a/patches/goffice-01-no-sunmath-lib.diff	Tue Jun 24 11:02:54 2008 +0000
+++ b/patches/goffice-01-no-sunmath-lib.diff	Tue Jun 24 13:06:12 2008 +0000
@@ -1,31 +1,39 @@
---- goffice-0.5.2/configure.orig	2007-11-16 18:35:43.014448000 +0000
-+++ goffice-0.5.2/configure	2007-11-16 18:36:31.744429000 +0000
-@@ -26870,7 +26870,7 @@
+Index: trunk/configure.in
+===================================================================
+--- trunk/configure.in	(revision 2123)
++++ trunk/configure.in	(working copy)
+@@ -440,7 +440,9 @@
  if test $ac_cv_c_long_double = yes; then
      have_mandatory_funcs=yes
      need_sunmath=0
 -    sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath'
-+    sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib'
-     for ldfunc in fabsl logl log10l ceill floorl powl isnanl finitel; do
- 	    as_ac_var=`echo "ac_cv_func_$ldfunc" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking for $ldfunc" >&5
-@@ -27037,7 +27037,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsunmath -L/opt/SUNWspro/lib $GOFFICE_LIBS $LIBS"
-+LIBS="-L/opt/SUNWspro/lib $GOFFICE_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
---- goffice-0.5.2/configure.in.orig	2007-11-16 18:35:50.467893000 +0000
-+++ goffice-0.5.2/configure.in	2007-11-16 18:36:16.880534000 +0000
-@@ -425,7 +425,7 @@
- if test $ac_cv_c_long_double = yes; then
-     have_mandatory_funcs=yes
-     need_sunmath=0
--    sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib -lsunmath'
-+    sunmathlinkstuff='-L/opt/SUNWspro/lib -R/opt/SUNWspro/lib'
++    ss_cc=`which cc`
++    ss_dir=`dirname $ss_cc`"/.."
++    sunmathlinkstuff="-L$ss_dir/lib -R$ss_dir/lib -lsunmath"
      for ldfunc in fabsl logl log10l ceill floorl powl isnanl finitel; do
  	    AC_CHECK_FUNC($ldfunc,
  		  ,
+@@ -452,12 +454,12 @@
+ 			  [ if test $need_sunmath = 0; then
+ 				# FIXME: better idea?
+ 				LDFLAGS="$LDFLAGS $sunmathlinkstuff"
+-				sunmathinclude=`ls -d /opt/SUNWspro/*/include/cc | sed '$!d'`
++				sunmathinclude=`ls -d $ss_dir/*/include/cc | sed '$!d'`
+ 				CPPFLAGS="$CPPFLAGS -I$sunmathinclude"
+ 			    fi
+ 			    need_sunmath=1 ],
+ 			  [have_mandatory_funcs=no],
+-			  [-L/opt/SUNWspro/lib $GOFFICE_LIBS])])])
++			  [-L$ss_dir/lib $GOFFICE_LIBS])])])
+     done
+     if test $need_sunmath = 1; then
+ 	EXTRA_LIBS="$EXTRA_LIBS $sunmathlinkstuff"
+@@ -467,6 +469,8 @@
+ 			 [AC_MSG_WARN([Long doubles require the $ac_header header.])
+ 			  have_mandatory_funcs=no])
+     fi
++    unset ss_cc
++    unset ss_dir
+     unset need_sunmath
+     unset sunmathlinkstuff
+     unset sunmathinclude