--- a/components/python/pycurl/pycurl-26.p5m	Thu Feb 23 15:58:00 2012 -0800
+++ b/components/python/pycurl/pycurl-26.p5m	Fri Feb 24 13:30:24 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/library/python-2/pycurl-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -33,7 +33,9 @@
 
 license pycurl.copyright license=MIT
 
-depend fmri=library/python-2/[email protected] type=optional
+# force a dependency on the pycurl package
+depend fmri=library/python-2/pycurl@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+    type=require
 
 dir path=usr
 dir path=usr/lib
@@ -41,62 +43,8 @@
 dir path=usr/lib/python2.6/vendor-packages
 dir path=usr/lib/python2.6/vendor-packages/64
 dir path=usr/lib/python2.6/vendor-packages/curl
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/pycurl
-dir path=usr/share/doc/pycurl/examples
-dir path=usr/share/doc/pycurl/html
-dir path=usr/share/doc/pycurl/tests
 file path=usr/lib/python2.6/vendor-packages/64/pycurl.so
 file path=usr/lib/python2.6/vendor-packages/curl/__init__.py
 file \
     path=usr/lib/python2.6/vendor-packages/pycurl-$(COMPONENT_VERSION)-py2.6.egg-info
 file path=usr/lib/python2.6/vendor-packages/pycurl.so
-file path=usr/share/doc/pycurl/COPYING
-file path=usr/share/doc/pycurl/COPYING2
-file path=usr/share/doc/pycurl/ChangeLog
-file path=usr/share/doc/pycurl/INSTALL
-file path=usr/share/doc/pycurl/README
-file path=usr/share/doc/pycurl/TODO
-file path=usr/share/doc/pycurl/examples/basicfirst.py
-file path=usr/share/doc/pycurl/examples/file_upload.py
-file path=usr/share/doc/pycurl/examples/linksys.py
-file path=usr/share/doc/pycurl/examples/retriever-multi.py
-file path=usr/share/doc/pycurl/examples/retriever.py
-file path=usr/share/doc/pycurl/examples/sfquery.py
-file path=usr/share/doc/pycurl/examples/xmlrpc_curl.py
-file path=usr/share/doc/pycurl/html/callbacks.html
-file path=usr/share/doc/pycurl/html/curlmultiobject.html
-file path=usr/share/doc/pycurl/html/curlobject.html
-file path=usr/share/doc/pycurl/html/curlshareobject.html
-file path=usr/share/doc/pycurl/html/pycurl.html
-file path=usr/share/doc/pycurl/tests/test.py
-file path=usr/share/doc/pycurl/tests/test_cb.py
-file path=usr/share/doc/pycurl/tests/test_debug.py
-file path=usr/share/doc/pycurl/tests/test_ftp.py
-file path=usr/share/doc/pycurl/tests/test_getinfo.py
-file path=usr/share/doc/pycurl/tests/test_gtk.py
-file path=usr/share/doc/pycurl/tests/test_internals.py
-file path=usr/share/doc/pycurl/tests/test_memleak.py
-file path=usr/share/doc/pycurl/tests/test_multi.py
-file path=usr/share/doc/pycurl/tests/test_multi2.py
-file path=usr/share/doc/pycurl/tests/test_multi3.py
-file path=usr/share/doc/pycurl/tests/test_multi4.py
-file path=usr/share/doc/pycurl/tests/test_multi5.py
-file path=usr/share/doc/pycurl/tests/test_multi6.py
-file path=usr/share/doc/pycurl/tests/test_multi_socket.py
-file path=usr/share/doc/pycurl/tests/test_multi_socket_select.py
-file path=usr/share/doc/pycurl/tests/test_multi_timer.py
-file path=usr/share/doc/pycurl/tests/test_multi_vs_thread.py
-file path=usr/share/doc/pycurl/tests/test_post.py
-file path=usr/share/doc/pycurl/tests/test_post2.py
-file path=usr/share/doc/pycurl/tests/test_post3.py
-file path=usr/share/doc/pycurl/tests/test_share.py
-file path=usr/share/doc/pycurl/tests/test_socketopen.py
-file path=usr/share/doc/pycurl/tests/test_stringio.py
-file path=usr/share/doc/pycurl/tests/test_xmlrpc.py
-file path=usr/share/doc/pycurl/tests/util.py
-
-# we have to reverse the autopyc transform for stuff in /usr/share/doc
-# since there are only py files there
-<transform file path=usr/share/doc/.+\.pyc$ -> drop>