diff -r 4de0581be621 -r 87e11e685b1f components/bash/bash.p5m --- a/components/bash/bash.p5m Wed Apr 13 10:10:46 2011 -0600 +++ b/components/bash/bash.p5m Wed Apr 13 09:58:06 2011 -0700 @@ -20,11 +20,16 @@ # # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. # -set name=pkg.fmri value=pkg:/shell/bash@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) + + default mangler.man.stability volatile> +set name=pkg.fmri \ + value=pkg:/shell/bash@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="GNU Bourne-Again shell (bash)" -set name=info.classification value="org.opensolaris.category.2008:System/Shells" -set name=info.upstream_url value="http://www.gnu.org/software/bash/" +set name=info.classification value=org.opensolaris.category.2008:System/Shells set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream_url value=http://www.gnu.org/software/bash/ +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/PSARC/2000/488 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) # dir path=etc @@ -93,11 +98,11 @@ dir path=usr/share/locale/zh_TW/LC_MESSAGES dir path=usr/share/man dir path=usr/share/man/man1 +file etc.bash.bash_completion path=etc/bash/bash_completion.example # -file path=etc/bash/bashrc.example -file path=etc/bash/bash_completion.example -file path=etc/bash/inputrc.example -file path=etc/skel/.bashrc +file etc.bash.bashrc path=etc/bash/bashrc.example +file etc.bash.inputrc path=etc/bash/inputrc.example +file etc.skel.bashrc path=etc/skel/.bashrc file path=usr/bin/bash file path=usr/share/bash/alias file path=usr/share/bash/arith @@ -175,6 +180,7 @@ file path=usr/share/bash/variable_help file path=usr/share/bash/wait file path=usr/share/bash/while +file path=usr/share/info/bash.info file path=usr/share/locale/af/LC_MESSAGES/bash.mo file path=usr/share/locale/bg/LC_MESSAGES/bash.mo file path=usr/share/locale/ca/LC_MESSAGES/bash.mo @@ -204,19 +210,16 @@ file path=usr/share/locale/vi/LC_MESSAGES/bash.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/bash.mo file path=usr/share/man/man1/bash.1 -file path=usr/share/man/man1/rbash.1 -file path=usr/share/info/bash.info +file rbash.1 path=usr/share/man/man1/rbash.1 # -link path=usr/bin/rbash target=./bash -link path=usr/gnu/bin/sh target=../../bin/bash +legacy pkg=SUNWbash desc="GNU Bourne-Again shell (bash) version 4.1" \ + name="GNU Bourne-Again shell (bash)" +legacy pkg=SUNWbashr \ + desc="GNU Bourne-Again shell (bash) version 4.1 (root package)" \ + name="GNU Bourne-Again shell (bash) (root)" # license bash.license license="GPLv3, FDLv1.2" # -legacy pkg=SUNWbash \ - desc="GNU Bourne-Again shell (bash) version 4.1" \ - name="GNU Bourne-Again shell (bash)" +link path=usr/bin/rbash target=./bash +link path=usr/gnu/bin/sh target=../../bin/bash -legacy pkg=SUNWbashr \ - desc="GNU Bourne-Again shell (bash) version 4.1 (root package)" \ - name="GNU Bourne-Again shell (bash) (root)" -