--- a/ChangeLog	Thu Jun 05 00:42:53 2008 +0000
+++ b/ChangeLog	Thu Jun 05 06:22:52 2008 +0000
@@ -1,3 +1,9 @@
+2008-06-04  Rick Ju <[email protected]>
+
+	* SUNWdesktop-search-libs.spec: renamed as SUNWw3m.spec 
+	  copyright/SUNWdesktop-search-lib.copyright: renamed as SUNWw3m.copyright
+		SUNWdesktop-search.spec: changed for the dependency on SUNWw3m 
+
 2008-06-04  Takao Fujiwara  <[email protected]>
 
 	* base-specs/w3m.spec: Updated.

--- a/SUNWdesktop-search-libs.spec	Thu Jun 05 00:42:53 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-#
-# spec file for packages SUNWdesktop-search-libs
-#
-# includes module(s): w3m
-#
-# 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:rickju
-#
-%include Solaris.inc
-
-%use w3m = w3m.spec
-
-Name:                    SUNWdesktop-search-libs
-Summary:                 Desktop search tool - support libraries
-Version:                 %{default_pkg_version}
-SUNW_BaseDir:            %{_basedir}
-SUNW_Copyright:          %{name}.copyright
-BuildRoot:               %{_tmppath}/%{name}-%{version}-build
-
-%include default-depend.inc
-Requires:            SUNWlibm
-Requires:            SUNWlibgc
-Requires:            SUNWperl584core
-Requires:            SUNWfirefox
-Requires:            SUNWopenssl-libraries
-BuildRequires:       SUNWlibgc-devel
-BuildRequires:       SUNWopenssl-include
-
-%if %build_l10n
-%package l10n
-Summary:                 %{summary} - l10n files
-SUNW_BaseDir:            %{_basedir}
-%include default-depend.inc
-Requires:                %{name}
-%endif
-
-%prep
-rm -rf %name-%version
-mkdir %name-%version
-%w3m.prep -d %name-%version
-
-%build
-export CFLAGS="%optflags"
-export LDFLAGS="%_ldflags"
-export RPM_OPT_FLAGS="$CFLAGS"
-export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
-
-%w3m.build -d %name-%version
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-%w3m.install -d %name-%version
-
-#remove man page and help file for ja
-rm -rf $RPM_BUILD_ROOT%{_mandir}/ja
-rm -rf $RPM_BUILD_ROOT%{_datadir}/w3m/w3mhelp-funcdesc.ja.pl
-
-%if %build_l10n
-%else
-# REMOVE l10n FILES
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
-%endif
-
-%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-%{_bindir}/*
-%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/w3m
-%dir %attr (0755, root, sys) %{_datadir}
-%{_datadir}/w3m/*
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/man1
-%{_mandir}/man1/*
-
-%if %build_l10n
-%files l10n
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %{_datadir}
-%attr (-, root, other) %{_datadir}/locale
-%endif
-
-%changelog
-* Wed Jun 04 2008 - [email protected]
-- Add l10n packages with w3m fix.
-* Mon May 26 2008 - [email protected]
-- Add openssl dependency
-* Tue Apr 15 2008 - [email protected]
-- Remove l10n package as the libgsf files were the only l10n files.
-* Mon Apr 14 2008 - [email protected]
-- Move libgsf part into SUNWlibgsf. Remove -root and devel pkgs too.
-* Thu Mar 27 2008 - [email protected]
-- Add copyright file
-* Wed Feb 27 2008 - [email protected]
-- Remove man pages for ja
-- Add Requires:{name} for -devel pkg
-* Tue Feb 26 2008 - [email protected]
-- Remove Requires: SUNWpostrun, Add Requires: SUNWdesktop-search-libs-root
-- Move %{_mandir}/ja into -l1n pkg
-- Use gconf-install.script for %post root
-* Wed Feb 20 2008 - [email protected]
-- Remove unused SOURCE0
-* Tue Jan 29 2008 - [email protected]
-- Add Build/Requires SUNWgnome-python-libs/-devel.
-* Thu Jan 24 2008 - [email protected]
-- Move libgc out.
-* Wed Jan 02 2008 - [email protected]
-- Initial spec-file created

--- a/SUNWdesktop-search.spec	Thu Jun 05 00:42:53 2008 +0000
+++ b/SUNWdesktop-search.spec	Thu Jun 05 06:22:52 2008 +0000
@@ -53,7 +53,7 @@
 Requires:       SUNWgnome-pdf-viewer
 Requires:       SUNWlxsl
 Requires:       SUNWlibgsf
-Requires:       SUNWdesktop-search-libs
+Requires:       SUNWw3m
 BuildRequires:  SUNWgnome-media-devel
 BuildRequires:  SUNWpng-devel
 BuildRequires:  SUNWogg-vorbis-devel

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWw3m.spec	Thu Jun 05 06:22:52 2008 +0000
@@ -0,0 +1,96 @@
+#
+# spec file for packages SUNWw3m
+#
+# includes module(s): w3m
+#
+# 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 w3m = w3m.spec
+
+Name:                    SUNWw3m
+Summary:                 Desktop search tool - support libraries
+Version:                 %{default_pkg_version}
+SUNW_BaseDir:            %{_basedir}
+SUNW_Copyright:          %{name}.copyright
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+
+%include default-depend.inc
+Requires:            SUNWlibm
+Requires:            SUNWlibgc
+Requires:            SUNWperl584core
+Requires:            SUNWfirefox
+Requires:            SUNWopenssl-libraries
+BuildRequires:       SUNWlibgc-devel
+BuildRequires:       SUNWopenssl-include
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+%w3m.prep -d %name-%version
+
+%build
+export CFLAGS="%optflags"
+export LDFLAGS="%_ldflags"
+export RPM_OPT_FLAGS="$CFLAGS"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+
+%w3m.build -d %name-%version
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%w3m.install -d %name-%version
+
+#remove man page and help file for ja
+rm -rf $RPM_BUILD_ROOT%{_mandir}/ja
+rm -rf $RPM_BUILD_ROOT%{_datadir}/w3m/w3mhelp-funcdesc.ja.pl
+
+%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/w3m
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/w3m/*
+%dir %attr(0755, root, bin) %{_mandir}
+%dir %attr(0755, root, bin) %{_mandir}/man1
+%{_mandir}/man1/*
+
+%changelog
+* Thu Jun 05 2008 - [email protected]
+* renamed to SUNWw3m.spec 
+* Mon May 26 2008 - [email protected]
+- Add openssl dependency
+* Tue Apr 15 2008 - [email protected]
+- Remove l10n package as the libgsf files were the only l10n files.
+* Mon Apr 14 2008 - [email protected]
+- Move libgsf part into SUNWlibgsf. Remove -root and devel pkgs too.
+* Thu Mar 27 2008 - [email protected]
+- Add copyright file
+* Wed Feb 27 2008 - [email protected]
+- Remove man pages for ja
+- Add Requires:{name} for -devel pkg
+* Tue Feb 26 2008 - [email protected]
+- Remove Requires: SUNWpostrun, Add Requires: SUNWdesktop-search-libs-root
+- Move %{_mandir}/ja into -l1n pkg
+- Use gconf-install.script for %post root
+* Wed Feb 20 2008 - [email protected]
+- Remove unused SOURCE0
+* Tue Jan 29 2008 - [email protected]
+- Add Build/Requires SUNWgnome-python-libs/-devel.
+* Thu Jan 24 2008 - [email protected]
+- Move libgc out.
+* Wed Jan 02 2008 - [email protected]
+- Initial spec-file created

--- a/copyright/SUNWdesktop-search-libs.copyright	Thu Jun 05 00:42:53 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-
- Copyright (c) 2000, [email protected]
- Copyright (C) 2002, hito
-
---------------------------------------------------------------------
-
- Copyright (c) 1987, X Consortium
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to
- deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other
- dealings in this Software without prior written authorization from the X
- Consortium.
- 
-
---------------------------------------------------------------------
-
- by K.Okabe  Aug. 1999 
-
-*************************************************************************
-*
-* Copyright (C) 1993 David E. Steward & Zbigniew Leyk, all rights reserved.
-*
-*			     Meschach Library
-* 
-* This Meschach Library is provided "as is" without any express 
-* or implied warranty of any kind with respect to this software. 
-* In particular the authors shall not be liable for any direct, 
-* indirect, special, incidental or consequential damages arising 
-* in any way from use of the software.
-* 
-* Everyone is granted permission to copy, modify and redistribute this
-* Meschach Library, provided:
-*  1.  All copies contain this copyright notice.
-*  2.  All modified copies shall carry a notice stating who
-*      made the last modification and the date of such modification.
-*  3.  No charge is made for this software or works derived from it.  
-*      This clause shall not be construed as constraining other software
-*      distributed on the same medium as this software, nor is a
-*      distribution fee considered a charge.
-*
-**************************************************************************
-
---------------------------------------------------------------------
-
- (C) Copyright 1998-1999 by Akinori Ito
-
- This software may be redistributed freely for this purpose, in full 
- or in part, provided that this entire copyright notice is included 
- on any copies of this software and applications and derivations thereof.
-
- This software is provided on an "as is" basis, without warranty of any
- kind, either expressed or implied, as to any matter including, but not
- limited to warranty of fitness of purpose, or merchantability, or
- results obtained from use of this software.
- 
-
---------------------------------------------------------------------
- 
- by A.ITO  Feb. 1995
- by K.Okabe  Aug. 1999
- 
- You can use,copy,modify and distribute this program without any permission.
- 
---------------------------------------------------------------------
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/copyright/SUNWw3m.copyright	Thu Jun 05 06:22:52 2008 +0000
@@ -0,0 +1,82 @@
+
+ Copyright (c) 2000, [email protected]
+ Copyright (C) 2002, hito
+
+--------------------------------------------------------------------
+
+ Copyright (c) 1987, X Consortium
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Software without prior written authorization from the X
+ Consortium.
+ 
+
+--------------------------------------------------------------------
+
+ by K.Okabe  Aug. 1999 
+
+*************************************************************************
+*
+* Copyright (C) 1993 David E. Steward & Zbigniew Leyk, all rights reserved.
+*
+*			     Meschach Library
+* 
+* This Meschach Library is provided "as is" without any express 
+* or implied warranty of any kind with respect to this software. 
+* In particular the authors shall not be liable for any direct, 
+* indirect, special, incidental or consequential damages arising 
+* in any way from use of the software.
+* 
+* Everyone is granted permission to copy, modify and redistribute this
+* Meschach Library, provided:
+*  1.  All copies contain this copyright notice.
+*  2.  All modified copies shall carry a notice stating who
+*      made the last modification and the date of such modification.
+*  3.  No charge is made for this software or works derived from it.  
+*      This clause shall not be construed as constraining other software
+*      distributed on the same medium as this software, nor is a
+*      distribution fee considered a charge.
+*
+**************************************************************************
+
+--------------------------------------------------------------------
+
+ (C) Copyright 1998-1999 by Akinori Ito
+
+ This software may be redistributed freely for this purpose, in full 
+ or in part, provided that this entire copyright notice is included 
+ on any copies of this software and applications and derivations thereof.
+
+ This software is provided on an "as is" basis, without warranty of any
+ kind, either expressed or implied, as to any matter including, but not
+ limited to warranty of fitness of purpose, or merchantability, or
+ results obtained from use of this software.
+ 
+
+--------------------------------------------------------------------
+ 
+ by A.ITO  Feb. 1995
+ by K.Okabe  Aug. 1999
+ 
+ You can use,copy,modify and distribute this program without any permission.
+ 
+--------------------------------------------------------------------
+