20381780 missing dependency on security/compliance/openscap in several packages
authorJacob Varughese <jacob.varughese@oracle.com>
Thu, 22 Jan 2015 16:34:37 -0800
changeset 3674 d3ebbd68691f
parent 3673 48820ccccb98
child 3675 7879bc79abbf
20381780 missing dependency on security/compliance/openscap in several packages
components/openscap/openscap-perl-512.p5m
components/openscap/openscap-python-PYVER.p5m
components/openscap/openscap.p5m
--- a/components/openscap/openscap-perl-512.p5m	Thu Jan 22 15:38:14 2015 -0800
+++ b/components/openscap/openscap-perl-512.p5m	Thu Jan 22 16:34:37 2015 -0800
@@ -21,7 +21,6 @@
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=.* -> add pkg.depend.bypass-generate .*/libopenscap.so.8>
 set name=pkg.fmri \
     value=pkg:/library/perl-5/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
@@ -39,3 +38,7 @@
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/_openscap_pm.so
 file path=usr/perl5/vendor_perl/$(PERL_VERSION)/openscap.pm
 license openscap.license license="LGPLv2.1, LGPLv3, OVAL"
+
+# force a dependency on the Perl $(PERL_VERSION) runtime
+depend type=require fmri=__TBD pkg.debug.depend.file=perl \
+    pkg.debug.depend.path=usr/perl5/$(PERL_VERSION)/bin
--- a/components/openscap/openscap-python-PYVER.p5m	Thu Jan 22 15:38:14 2015 -0800
+++ b/components/openscap/openscap-python-PYVER.p5m	Thu Jan 22 16:34:37 2015 -0800
@@ -21,7 +21,6 @@
 # Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=.* -> add pkg.depend.bypass-generate .*/libopenscap.so.8>
 set name=pkg.fmri \
     value=pkg:/library/python/openscap-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
--- a/components/openscap/openscap.p5m	Thu Jan 22 15:38:14 2015 -0800
+++ b/components/openscap/openscap.p5m	Thu Jan 22 16:34:37 2015 -0800
@@ -23,7 +23,6 @@
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 <transform file path=usr/lib/openscap/.+ ->default mode 0555>
-<transform file path=.* -> add pkg.depend.bypass-generate .*/libopenscap.so.8>
 <transform file path=usr/share/docs/openscap/html/.* -> default facet.doc.html true>
 set name=pkg.fmri \
     value=pkg:/security/compliance/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)