--- a/ChangeLog	Thu Dec 17 10:07:07 2009 +0000
+++ b/ChangeLog	Thu Dec 17 10:18:38 2009 +0000
@@ -1,3 +1,11 @@
+2009-12-17  Ke Wang <[email protected]>
+
+	* SUNWlibproxy.spec:
+	* SUNWlibproxy-gnome.spec:
+	* SUNWlibproxy-mozjs.spec:
+	* base-specs/libproxy.spec: Fix bugster #6909957 - SUNWlibproxy should
+	  not depend on X programs
+
 2009-12-17  Halton Huo  <[email protected]>
 
 	* manpages/man1m/console-kit-daemon.1m: Add example to enable xkb and

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWlibproxy-gnome.spec	Thu Dec 17 10:18:38 2009 +0000
@@ -0,0 +1,99 @@
+#
+# spec file for package SUNWlibproxy-gnome
+#
+# includes module: libproxy
+#
+# Copyright 2009 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+%define owner wangke 
+#
+
+%include Solaris.inc
+
+%define pythonver %{default_python_version}
+%define build_module_gnome 1
+%define build_module_mozjs 0
+
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use libproxy_64 = libproxy.spec
+%endif
+
+%include base.inc
+%use libproxy = libproxy.spec
+
+Name:                   SUNWlibproxy-gnome
+Summary:                Plugin of libproxy to get proxy infomation set by GConf
+Version:                %{libproxy.version}
+SUNW_BaseDir:           %{_basedir}
+SUNW_Copyright:         SUNWlibproxy.copyright
+BuildRoot:              %{_tmppath}/%{name}-%{version}-build
+
+%include default-depend.inc
+Requires:               SUNWlibproxy
+Requires:               SUNWxwrtl
+Requires:               SUNWgnome-config
+Requires:               SUNWxwplt
+BuildRequires:          SUNWgnome-config
+BuildRequires:          SUNWxwplt
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%libproxy_64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%base_arch
+%libproxy.prep -d %name-%version/%base_arch
+
+%build
+export PYTHON=/usr/bin/python%{pythonver}
+
+%ifarch amd64 sparcv9
+export PKG_CONFIG_LIBDIR=%{_pkg_config_path64}
+%libproxy_64.build -d %name-%version/%_arch64
+%endif
+
+export PKG_CONFIG_LIBDIR=%{_pkg_config_path}
+%libproxy.build -d %name-%version/%base_arch
+
+%install
+%ifarch amd64 sparcv9
+%libproxy_64.install -d %name-%version/%_arch64
+%endif
+
+%libproxy.install -d %name-%version/%base_arch
+
+find $RPM_BUILD_ROOT%{_libdir} -name "ignore_domain.so" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -name "ignore_ip.so" -exec rm -f {} ';'
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/*.so*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/python*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, bin) %{_libdir}/libproxy
+%{_libdir}/libproxy/*
+
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}/libproxy
+%{_libdir}/%{_arch64}/libproxy/*
+%endif
+
+%changelog
+* Thu Dec 17 2009 - [email protected]
+- Initial spec.
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWlibproxy-mozjs.spec	Thu Dec 17 10:18:38 2009 +0000
@@ -0,0 +1,96 @@
+#
+# spec file for package SUNWlibproxy-mozjs
+#
+# includes module: libproxy
+#
+# Copyright 2009 Sun Microsystems, Inc.
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+%define owner wangke 
+#
+
+%include Solaris.inc
+
+%define pythonver %{default_python_version}
+%define build_module_gnome 0
+%define build_module_mozjs 1
+
+%ifarch amd64 sparcv9
+%include arch64.inc
+%use libproxy_64 = libproxy.spec
+%endif
+
+%include base.inc
+%use libproxy = libproxy.spec
+
+Name:                   SUNWlibproxy-mozjs
+Summary:                Plugin of libproxy for mozjs
+Version:                %{libproxy.version}
+SUNW_BaseDir:           %{_basedir}
+SUNW_Copyright:         SUNWlibproxy.copyright
+BuildRoot:              %{_tmppath}/%{name}-%{version}-build
+
+%include default-depend.inc
+Requires:               SUNWlibproxy
+Requires:               SUNWfirefox
+BuildRequires:          SUNWfirefox-devel
+
+%prep
+rm -rf %name-%version
+mkdir %name-%version
+
+%ifarch amd64 sparcv9
+mkdir %name-%version/%_arch64
+%libproxy_64.prep -d %name-%version/%_arch64
+%endif
+
+mkdir %name-%version/%base_arch
+%libproxy.prep -d %name-%version/%base_arch
+
+%build
+export PYTHON=/usr/bin/python%{pythonver}
+
+%ifarch amd64 sparcv9
+export PKG_CONFIG_LIBDIR=%{_pkg_config_path64}
+%libproxy_64.build -d %name-%version/%_arch64
+%endif
+
+export PKG_CONFIG_LIBDIR=%{_pkg_config_path}
+%libproxy.build -d %name-%version/%base_arch
+
+%install
+%ifarch amd64 sparcv9
+%libproxy_64.install -d %name-%version/%_arch64
+%endif
+
+%libproxy.install -d %name-%version/%base_arch
+
+find $RPM_BUILD_ROOT%{_libdir} -name "ignore_domain.so" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -name "ignore_ip.so" -exec rm -f {} ';'
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/*.so*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.so*
+rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_includedir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/python*
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_libdir}
+%dir %attr (0755, root, bin) %{_libdir}/libproxy
+%{_libdir}/libproxy/*
+
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
+%dir %attr (0755, root, bin) %{_libdir}/%{_arch64}/libproxy
+%{_libdir}/%{_arch64}/libproxy/*
+%endif
+
+%changelog
+* Thu Dec 17 2009 - [email protected]
+- Initial spec.
+

--- a/SUNWlibproxy.spec	Thu Dec 17 10:07:07 2009 +0000
+++ b/SUNWlibproxy.spec	Thu Dec 17 10:18:38 2009 +0000
@@ -13,6 +13,8 @@
 %include Solaris.inc
 
 %define pythonver %{default_python_version}
+%define build_module_gnome 0
+%define build_module_mozjs 0
 
 %ifarch amd64 sparcv9
 %include arch64.inc
@@ -31,15 +33,8 @@
 BuildRoot:              %{_tmppath}/%{name}-%{version}-build
 
 %include default-depend.inc
-Requires:               SUNWxwrtl
 Requires:               SUNWglib2
-Requires:               SUNWgnome-config
-Requires:               SUNWxwplt
-Requires:               SUNWfirefox
 BuildRequires:          SUNWglib2-devel
-BuildRequires:          SUNWgnome-config
-BuildRequires:          SUNWxwplt
-BuildRequires:          SUNWfirefox-devel
 BuildRequires:          SUNWPython26-devel
 
 %package devel
@@ -136,6 +131,9 @@
 %{_prefix}/demo/*
 
 %changelog
+* Thu Dec 17 2009 - [email protected]
+- Separated into three packages: SUNWlibproxy, SUNWlibproxy-gnome
+  and SUNWlibproxy-mozjs
 * Fri Sep 11 2009 - [email protected]
 - Bump to 0.3.0
 * Mon Sep 07 2009 - [email protected]

--- a/base-specs/libproxy.spec	Thu Dec 17 10:07:07 2009 +0000
+++ b/base-specs/libproxy.spec	Thu Dec 17 10:18:38 2009 +0000
@@ -46,6 +46,7 @@
 automake -a -c -f
 export CFLAGS="%optflags"
 export LDFLAGS="%{_ldflags}"
+
 ./configure --prefix=%{_prefix}			 \
 	    --libdir=%{_libdir}			 \
 	    --bindir=%{_bindir}			 \
@@ -53,7 +54,36 @@
             --sysconfdir=%{_sysconfdir}		 \
 	    --mandir=%{_mandir}			 \
 	    --libexecdir=%{_libexecdir}		 \
-            --without-kde	
+            --without-kde	                 \
+%if %build_module_gnome
+            --with-gnome                         \
+            --without-mozjs                      \
+            --without-dotnet                     \
+            --without-direct                     \
+            --without-envvar                     \
+            --without-file                       \
+            --without-wpad                       \
+            --without-networkmanager             \
+            --without-webkit                     \
+            --without-python
+%else
+%if %build_module_mozjs
+            --without-gnome                      \
+            --without-dotnet                     \
+            --without-direct                     \
+            --without-envvar                     \
+            --without-file                       \
+            --without-wpad                       \
+            --without-networkmanager             \
+            --without-webkit                     \
+            --without-python
+%else
+            --without-dotnet                     \
+            --without-gnome                      \
+            --without-mozjs
+%endif
+%endif
+
 make \
     pyexecdir=%{_libdir}/python%{pythonver}/vendor-packages \
     pythondir=%{_libdir}/python%{pythonver}/vendor-packages
@@ -66,14 +96,23 @@
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 
+%if %build_module_gnome
+%else
+%if %build_module_mozjs
+%else
 install -d $RPM_BUILD_ROOT%{_demodir}
 mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_demodir}
+%endif
+%endif
 rm -r $RPM_BUILD_ROOT%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Thu Dec 17 2009 - [email protected]
+- Separated into three packages: SUNWlibproxy, SUNWlibproxy-gnome
+  and SUNWlibproxy-mozjs
 * Fri Oct 16 2009 - [email protected]
 - Bump to 0.3.1
 * Fri Sep 11 2009 - [email protected]