--- a/ChangeLog	Thu Sep 04 07:26:07 2008 +0000
+++ b/ChangeLog	Thu Sep 04 10:48:36 2008 +0000
@@ -1,3 +1,9 @@
+2008-09-04  Darren Kenny  <[email protected]>
+
+	* SUNWnwam-manager.spec, base-specs/nwam-manager.spec:
+	  Fix review issues, add %preun root and fix l10n build packaging
+	  errors.
+
 2008-09-04 Jerry Tan <[email protected]>
  
       	* patches/tracker-02-disable-autostart.diff

--- a/SUNWnwam-manager.spec	Thu Sep 04 07:26:07 2008 +0000
+++ b/SUNWnwam-manager.spec	Thu Sep 04 10:48:36 2008 +0000
@@ -3,18 +3,18 @@
 #
 # includes module(s): nwam-manager
 #
-# Copyright (c) 2008 Sun Microsystems, Inc.
+# 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: Darren, Lin
+# Owner: dkenny
 #
 %include Solaris.inc
 
 %use nwam_manager = nwam-manager.spec
 
 Name:                    SUNWnwam-manager
-Summary:                 Nwam
+Summary:                 Network Auto-Magic User Interface
 Version:                 %{default_pkg_version}
 Source:                  %{name}-manpages-0.1.tar.gz
 SUNW_BaseDir:            %{_prefix}
@@ -54,15 +54,8 @@
 gzcat %SOURCE0 | tar xf -
 
 %build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-
-
 %nwam_manager.build -d %name-%version
 
-export PKG_CONFIG_PATH=../nwam-manager-%{nwam-manager.version}
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %nwam_manager.install -d %name-%version
@@ -90,6 +83,24 @@
 
 %include gconf-install.script
 
+%preun root
+
+%preun root
+test -x $BASEDIR/var/lib/postrun/postrun || exit 0
+( echo 'test -x $PKG_INSTALL_ROOT/usr/bin/gconftool-2 || {';
+  echo '  echo "WARNING: gconftool-2 not found; not uninstalling gconf schemas"';
+  echo '  exit 0';
+  echo '}';
+  echo 'umask 0022';
+  echo 'GCONF_CONFIG_SOURCE=xml:merged:$BASEDIR/etc/gconf/gconf.xml.defaults';
+  echo 'GCONF_BACKEND_DIR=$PKG_INSTALL_ROOT/usr/lib/GConf/2';
+  echo 'LD_LIBRARY_PATH=$PKG_INSTALL_ROOT/usr/lib';
+  echo 'export GCONF_CONFIG_SOURCE GCONF_BACKEND_DIR LD_LIBRARY_PATH';
+  echo 'SDIR=$BASEDIR%{_sysconfdir}/gconf/schemas';
+  echo 'schemas="$SDIR/nwam-manager.schemas"';
+  echo '$PKG_INSTALL_ROOT/usr/bin/gconftool-2 --makefile-uninstall-rule $schemas'
+) | $BASEDIR/var/lib/postrun/postrun -i -c JDS -a
+
 %files
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_libexecdir}
@@ -97,8 +108,8 @@
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, bin) %{_datadir}/nwam-manager
 %dir %attr (0755, root, bin) %{_datadir}/nwam-manager/icons
-%attr (-, root, other) %{_datadir}/nwam-manager/*.*
-%attr (-, root, other) %{_datadir}/nwam-manager/icons/*
+%attr (-, root, bin) %{_datadir}/nwam-manager/*.*
+%attr (-, root, bin) %{_datadir}/nwam-manager/icons/*
 %dir %attr (0755, root, other) %{_datadir}/icons
 %attr (-, root, other) %{_datadir}/icons/*
 %dir %attr(0755, root, bin) %{_mandir}
@@ -117,12 +128,11 @@
 %files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/gnome
 %attr (-, root, other) %{_datadir}/locale
-%{_datadir}/gnome/help/*/[a-z]*
-%{_datadir}/omf/*/*-[a-z]*.omf
 %endif
 
 %changelog
+* Thu Sep 4 2008 - [email protected]
+- Fix some issues in spec, add preun for schema and fix l10n build..
 * Wed Sep 3 2008 - [email protected]
 - Initial delivery.

--- a/base-specs/nwam-manager.spec	Thu Sep 04 07:26:07 2008 +0000
+++ b/base-specs/nwam-manager.spec	Thu Sep 04 10:48:36 2008 +0000
@@ -1,24 +1,21 @@
 #
 # spec file for package nwam-manager
 #
-# Copyright (c) 2007 Sun Microsystems, Inc.
+# 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: Darren, Lin
+# Owner: dkenny
 #
 %include l10n.inc
 Name:         nwam-manager
 License:      CDDL
 Group:        System/GUI/GNOME
 Version:      0.5.0
-Release:      0.5.0
-Distribution: Java Desktop System
-Vendor:       Sun Microsystems, Inc.
-Summary:      Network Auto-Magic
+Summary:      Network Auto-Magic User Interface
 Source:       http://src.opensolaris.org/source/raw/jds/nwam-manager/branches/phase-0.5/tarballs/%{name}-%{version}.tar.gz
 #Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
-URL:          http://www.opensolaris.org
+URL:          http://www.opensolaris.org/os/project/nwam
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}/%{name}
 Autoreqprov:  on
@@ -48,8 +45,6 @@
 
 %prep
 %setup -q
-%if %build_l10n
-%endif
 
 %build
 %ifos linux
@@ -71,7 +66,7 @@
 autoconf
 
 export PKG_CONFIG_PATH="%{_libdir}/pkgconfig:%{_datadir}/pkgconfig"
-CFLAGS="$RPM_OPT_FLAGS"	\
+CFLAGS="%optflags"	\
 ./configure \
 	--prefix=%{_prefix} \
 	--sysconfdir=%{_sysconfdir} \
@@ -81,9 +76,7 @@
 	--mandir=%{_mandir}         \
 	--localstatedir=/var/lib
 
-#error when parallel make
-#make -j $CPUS
-make
+make -j $CPUS
 
 %install
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -109,5 +102,7 @@
 %{_includedir}/nwam/*
 
 %changelog
-* Wed Aug 01 2007 - [email protected]
-- Initial
+* Thu Sep 4 2008 - [email protected]
+- Fix some issues in spec 
+* Wed Sep 3 2008 - [email protected]
+- Initial delivery.