--- a/ChangeLog	Wed Apr 06 22:59:13 2011 +0000
+++ b/ChangeLog	Thu Apr 07 14:47:51 2011 +0000
@@ -1,3 +1,8 @@
+2011-04-07  Ghee Teo  <[email protected]>
+
+	Fixes bugster#7031707.
+	* specs/SUNWgnu-findutils.spec:
+
 2011-04-06  Ghee Teo  <[email protected]>
 
 	Fixes bugster#7011893.

--- a/specs/SUNWgnu-findutils.spec	Wed Apr 06 22:59:13 2011 +0000
+++ b/specs/SUNWgnu-findutils.spec	Thu Apr 07 14:47:51 2011 +0000
@@ -5,7 +5,7 @@
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-%define owner kevmca
+%define owner gheet
 #
 
 %include Solaris.inc
@@ -75,11 +75,10 @@
 sh %SOURCE1 --enable-copyright
 %endif
 ./configure --disable-leaf-optimisation \
-            --prefix=%{_basedir} \
-            --program-prefix=g \
-            --mandir=%{_mandir} \
-	    --infodir=%{_datadir}/info \
-            --libexecdir=%{_libexecdir}
+            --prefix=%{_gnudir} \
+            --mandir=%{_gnuman} \
+	    --infodir=%{_gnudata}/info \
+            --libexecdir=%{_gnudir}/lib
 
 make -j$CPUS
 
@@ -87,30 +86,32 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-rmdir $RPM_BUILD_ROOT%{_basedir}%{_localstatedir}
-rm -rf $RPM_BUILD_ROOT%{_basedir}/lib/charset.alias
+rmdir $RPM_BUILD_ROOT%{_gnudir}%{_localstatedir}
+rm -rf $RPM_BUILD_ROOT%{_gnudir}/lib/charset.alias
 
 #remove unused files
-rm -rf $RPM_BUILD_ROOT%{_libdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir
-rm -rf $RPM_BUILD_ROOT%{_bindir}/glocate
+rm -rf $RPM_BUILD_ROOT%{_gnudir}/lib
+rm -rf $RPM_BUILD_ROOT%{_gnudata}/info/dir
+rm -rf $RPM_BUILD_ROOT%{_gnubin}/locate
 rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/glocate.1
-rm -rf $RPM_BUILD_ROOT%{_bindir}/gupdatedb
+rm -rf $RPM_BUILD_ROOT%{_gnubin}/updatedb
 rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/gupdatedb.1
 rm -rf $RPM_BUILD_ROOT%{_mandir}/man5
 
 #create links in gnu dir
-mkdir -p $RPM_BUILD_ROOT%{_gnubin}
-ln -s ../../bin/gfind $RPM_BUILD_ROOT%{_gnubin}/find
-ln -s ../../bin/gxargs $RPM_BUILD_ROOT%{_gnubin}/xargs
-mkdir -p $RPM_BUILD_ROOT%{_gnuman}/man1
-ln -s ../../../../share/man/man1/gfind.1 $RPM_BUILD_ROOT%{_gnuman}/man1/find.1
-ln -s ../../../../share/man/man1/gxargs.1 $RPM_BUILD_ROOT%{_gnuman}/man1/xargs.1
+cd $RPM_BUILD_ROOT
+install -m 755 -d usr/bin
+
+ln -s ../gnu/bin/find usr/bin/gfind
+ln -s ../gnu/bin/xargs usr/bin/gxargs
+install -m 755 -d usr/share/man/man1
+ln -s ../../../gnu/share/man/man1/find.1 usr/share/man/man1/gfind.1
+ln -s ../../../gnu/share/man/man1/xargs.1 usr/share/man/man1/gxargs.1
 
 %if %build_l10n
 %else
 # REMOVE l10n FILES
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{_gnudata}/locale
 %endif
 
 %clean
@@ -123,7 +124,7 @@
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
 %dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/info
+%{_gnudata}/info
 %{_mandir}
 %dir %attr (0755, root, bin) %{_gnubin}
 %{_gnubin}/*
@@ -133,11 +134,14 @@
 %if %build_l10n
 %files l10n
 %defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
+%dir %attr (0755, root, sys) %{_gnudata}
+%attr (-, root, other) %{_gnudata}/locale
+%{_gnudata}/locale/*
 %endif
 
 %changelog
+* Thu Apr 07 2011 - [email protected]
+- Fixes bugster#7031707.
 * Tue Aug 25 2009 - [email protected]
 - Rever to 4.2.31.  Newer versions are GPLv3.
 * Tue Aug 25 2009 - [email protected]