17346851 apr and apr-util packages need improvements in regards pkg facets s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 19 Dec 2013 01:51:35 -0800
branchs11-update
changeset 2858 2600c41ce351
parent 2857 4d5915524762
child 2859 2e7a684f3c3d
17346851 apr and apr-util packages need improvements in regards pkg facets
components/apr-util/apr-util-13-doc.p5m
components/apr-util/apr-util-13.p5m
components/apr/apr-13-doc.p5m
components/apr/apr-13.p5m
components/apr/doc-transform
--- a/components/apr-util/apr-util-13-doc.p5m	Thu Dec 19 01:51:35 2013 -0800
+++ b/components/apr-util/apr-util-13-doc.p5m	Thu Dec 19 01:51:35 2013 -0800
@@ -22,6 +22,7 @@
 #
 <transform file path=usr/apr-util/1.3/manual/(.+)$ -> set action.hash %<\1> >
 <transform file path=usr/apr-util/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/apr-util/1.3/manual/.* -> default facet.doc.html all>
 
 set name=pkg.fmri \
     value=pkg:/library/apr-util-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/apr-util/apr-util-13.p5m	Thu Dec 19 01:51:35 2013 -0800
+++ b/components/apr-util/apr-util-13.p5m	Thu Dec 19 01:51:35 2013 -0800
@@ -20,6 +20,9 @@
 #
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file link hardlink path=usr/apr-util/1.3/.* -> \
+    default facet.devel all>
+
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
@@ -86,23 +89,26 @@
 file path=usr/apr-util/1.3/lib/apr-util-1/apr_ldap.a
 file path=usr/apr-util/1.3/lib/aprutil.exp
 file path=usr/apr-util/1.3/lib/libaprutil-1.a
-file path=usr/apr-util/1.3/lib/libaprutil-1.so.0.3.9
+file path=usr/apr-util/1.3/lib/libaprutil-1.so.0.3.9 facet.devel=false
 file path=usr/apr-util/1.3/lib/pkgconfig/apr-util-1.pc
 file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_mysql.a
 file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_dbd_sqlite3.a
 file path=usr/apr-util/1.3/lib/$(MACH64)/apr-util-1/apr_ldap.a
 file path=usr/apr-util/1.3/lib/$(MACH64)/aprutil.exp
 file path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.a
-file path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so.0.3.9
+file path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so.0.3.9 facet.devel=false
 file path=usr/apr-util/1.3/lib/$(MACH64)/pkgconfig/apr-util-1.pc
 link path=usr/bin/$(MACH64)/apu-1-config target=../../apr-util/1.3/bin/$(MACH64)/apu-1-config
 link path=usr/apr-util/1.3/bin/64 target=$(MACH64)
 link path=usr/bin/apu-1-config target=../apr-util/1.3/bin/apu-1-config
-link path=usr/apr-util/1.3/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9
-link path=usr/apr-util/1.3/lib/libaprutil-1.so target=libaprutil-1.so.0.3.9
+link path=usr/apr-util/1.3/lib/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9 \
+     facet.devel=false
+link path=usr/apr-util/1.3/lib/libaprutil-1.so target=libaprutil-1.so.0.3.9 \
+     facet.devel=false
 link path=usr/apr-util/1.3/lib/64 target=$(MACH64)
-link path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so target=libaprutil-1.so.0.3.9
-link path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9
-
+link path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so target=libaprutil-1.so.0.3.9 \
+     facet.devel=false
+link path=usr/apr-util/1.3/lib/$(MACH64)/libaprutil-1.so.0 target=libaprutil-1.so.0.3.9 \
+     facet.devel=false
 
 license apr-util.license license="Apache v2.0"
--- a/components/apr/apr-13-doc.p5m	Thu Dec 19 01:51:35 2013 -0800
+++ b/components/apr/apr-13-doc.p5m	Thu Dec 19 01:51:35 2013 -0800
@@ -22,6 +22,7 @@
 #
 <transform file path=usr/apr/1.3/manual/(.+)$ -> set action.hash %<\1> >
 <transform file path=usr/apr/1.3/manual/search/(.+)$ -> set action.hash %<\1> >
+<transform file path=usr/apr/1.3/manual/.* -> default facet.doc.html all>
 
 set name=pkg.fmri \
     value=pkg:/library/apr-13/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- a/components/apr/apr-13.p5m	Thu Dec 19 01:51:35 2013 -0800
+++ b/components/apr/apr-13.p5m	Thu Dec 19 01:51:35 2013 -0800
@@ -20,6 +20,9 @@
 #
 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
+<transform file link hardlink path=usr/apr/1.3/.* -> \
+    default facet.devel all>
+
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
@@ -98,21 +101,24 @@
 file path=usr/apr/1.3/include/apr_want.h
 file path=usr/apr/1.3/lib/$(MACH64)/apr.exp
 file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.a
-file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0.3.9
+file path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0.3.9 facet.devel=false
 file path=usr/apr/1.3/lib/$(MACH64)/pkgconfig/apr-1.pc
 file path=usr/apr/1.3/lib/apr.exp
 file path=usr/apr/1.3/lib/libapr-1.a
-file path=usr/apr/1.3/lib/libapr-1.so.0.3.9
+file path=usr/apr/1.3/lib/libapr-1.so.0.3.9 facet.devel=false
 file path=usr/apr/1.3/lib/pkgconfig/apr-1.pc
 link path=usr/apr/1.3/bin/64 target=$(MACH64)
 link path=usr/apr/1.3/build/64 target=$(MACH64)
-link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.3.9
-link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.3.9
+link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so target=libapr-1.so.0.3.9 \
+     facet.devel=false
+link path=usr/apr/1.3/lib/$(MACH64)/libapr-1.so.0 target=libapr-1.so.0.3.9 \
+     facet.devel=false
 link path=usr/apr/1.3/lib/64 target=$(MACH64)
-link path=usr/apr/1.3/lib/libapr-1.so target=libapr-1.so.0.3.9
-link path=usr/apr/1.3/lib/libapr-1.so.0 target=libapr-1.so.0.3.9
+link path=usr/apr/1.3/lib/libapr-1.so target=libapr-1.so.0.3.9 \
+     facet.devel=false
+link path=usr/apr/1.3/lib/libapr-1.so.0 target=libapr-1.so.0.3.9 \
+     facet.devel=false
 link path=usr/bin/$(MACH64)/apr-1-config target=../../apr/1.3/bin/$(MACH64)/apr-1-config
 link path=usr/bin/apr-1-config target=../apr/1.3/bin/apr-1-config
 
-
 license apr.license license="Apache v2.0"
--- a/components/apr/doc-transform	Thu Dec 19 01:51:35 2013 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
-#
-
-<transform file path=usr/apr/1.3/manual/(.+)$ -> \
-	set action.hash %<\1> >