--- a/ChangeLog	Tue Aug 26 13:44:50 2008 +0000
+++ b/ChangeLog	Tue Aug 26 14:36:02 2008 +0000
@@ -1,3 +1,10 @@
+2008-08-26  Ghee Teo <[email protected]>
+
+	Updated spec files to make sure directory attributes are correct and
+	also full libraries linkage.
+	* SUNWgnome-nettool.spec:
+	* patches/gnome-nettool-01-sun-patch.diff:
+
 2008-08-26  Takao Fujiwara  <[email protected]>
 
 	* SUNWgnome-commander.spec: Updated the patch state.

--- a/SUNWgnome-nettool.spec	Tue Aug 26 13:44:50 2008 +0000
+++ b/SUNWgnome-nettool.spec	Tue Aug 26 14:36:02 2008 +0000
@@ -89,16 +89,39 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
-%dir %attr (0755, root, other) %{_datadir}/applications
+%dir %attr (-, root, sys) %{_datadir}
+%dir %attr (-, root, other) %{_datadir}/applications
 %{_datadir}/applications/*
-%dir %attr (0755, root, other) %{_datadir}/icons
-%{_datadir}/icons/*
+%dir %attr (-, root, other) %{_datadir}/icons
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/16x16/apps
+%{_datadir}/icons/hicolor/16x16/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/22x22/apps
+%{_datadir}/icons/hicolor/22x22/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/24x24/apps
+%{_datadir}/icons/hicolor/24x24/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/32x32/apps
+%{_datadir}/icons/hicolor/32x32/apps/*.png
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable
+%dir %attr (-, root, other) %{_datadir}/icons/hicolor/scalable/apps
+%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %dir %attr (0755, root, other) %{_datadir}/%{nettool.name}
-%{_datadir}/%{nettool.name}/*
-%dir %attr (0755, root, other) %{_datadir}/gnome
-%{_datadir}/gnome/*
-%dir %attr (0755, root, other) %{_datadir}/omf
-%{_datadir}/omf/*
+%dir %attr (0755, root, other) %{_datadir}/%{nettool.name}/dialogs
+%{_datadir}/%{nettool.name}/dialogs/*
+%dir %attr (0755, root, other) %{_datadir}/%{nettool.name}/pixmaps
+%{_datadir}/%{nettool.name}/pixmaps/*
+%dir %attr (-, root, other) %{_datadir}/gnome
+%dir %attr (-, root, bin) %{_datadir}/gnome/help
+%dir %attr (-, root, other) %{_datadir}/gnome/help/%{nettool.name}
+%dir %attr (-, root, other) %{_datadir}/gnome/help/%{nettool.name}/C
+%{_datadir}/gnome/help/%{nettool.name}/C/*
+%dir %attr (-, root, bin) %{_datadir}/omf
+%dir %attr (-, root, other) %{_datadir}/omf/%{nettool.name}
+%{_datadir}/omf/%{nettool.name}/*
 %{_mandir}/*/*
 
 %if %build_l10n

--- a/patches/gnome-nettool-01-sun-patch.diff	Tue Aug 26 13:44:50 2008 +0000
+++ b/patches/gnome-nettool-01-sun-patch.diff	Tue Aug 26 14:36:02 2008 +0000
@@ -27,13 +27,15 @@
  	callbacks.c callbacks.h \
  	nettool.c nettool.h \
  	gn-combo-history.c gn-combo-history.h \
-@@ -29,7 +30,9 @@
+@@ -29,7 +30,11 @@
  	util-mii-wireless.h \
  	main.c
  
 -gnome_nettool_LDADD = @NETTOOL_LIBS@
 +gnome_nettool_LDADD = @NETTOOL_LIBS@	\
 +		      -lresolv	\
++		      -lsocket	\
++		      -lnsl	\
 +		      -lkstat
  
  EXTRA_DIST  = \