changeset 3818:6242cb4e0f7e

6533314 SUNWppm is a usr package, but delivers bits to the root file system
author ceastha
date Wed, 14 Mar 2007 11:35:12 -0700
parents e2aeb8ed177f
children 9aa2160bf09e
files usr/src/pkgdefs/SUNWpcr/preremove usr/src/pkgdefs/SUNWpcr/prototype_com usr/src/pkgdefs/SUNWppm/preremove usr/src/pkgdefs/SUNWppm/prototype_com
diffstat 4 files changed, 40 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWpcr/preremove	Wed Mar 14 11:35:12 2007 -0700
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# 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 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Remove ppdmgr created cache files
+/bin/rm -f $BASEDIR/var/lp/ppd/caches/*
+/bin/rm -f $BASEDIR/var/lp/ppd/ppdcache
+
+exit 0
--- a/usr/src/pkgdefs/SUNWpcr/prototype_com	Wed Mar 14 10:33:35 2007 -0700
+++ b/usr/src/pkgdefs/SUNWpcr/prototype_com	Wed Mar 14 11:35:12 2007 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,6 +39,7 @@
 i copyright
 i depend
 i postinstall
+i preremove
 i i.preserve
 i i.manifest
 i r.manifest
@@ -55,3 +56,7 @@
 f manifest var/svc/manifest/application/print/rfc1179.xml 0444 root sys
 d none var/spool 755 root bin
 d none var/spool/print 0755 root lp
+d none var/lp 775 lp lp
+d none var/lp/ppd 755 root lp
+d none var/lp/ppd/caches 755 root lp
+f none var/lp/ppd/manufaliases 444 root lp
--- a/usr/src/pkgdefs/SUNWppm/preremove	Wed Mar 14 10:33:35 2007 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-#!/bin/sh
-#
-# 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 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-# Remove ppdmgr created cache files
-/bin/rm -f $BASEDIR/var/lp/ppd/caches/*
-/bin/rm -f $BASEDIR/var/lp/ppd/ppdcache
-
-exit 0
--- a/usr/src/pkgdefs/SUNWppm/prototype_com	Wed Mar 14 10:33:35 2007 -0700
+++ b/usr/src/pkgdefs/SUNWppm/prototype_com	Wed Mar 14 11:35:12 2007 -0700
@@ -35,7 +35,6 @@
 i pkginfo
 i copyright
 i depend
-i preremove
 
 #
 # source locations relative to the prototype file
@@ -58,7 +57,7 @@
 f none usr/sadm/admin/printmgr/classes/pmserver.jar 644 root lp
 f none usr/sadm/admin/printmgr/classes/pmclient.jar 644 root lp
 #
-# Scripts and files for ppdmgr
+# Scripts and files for printmgr and ppdmgr
 #
 d none usr/lib 755 root bin
 d none usr/lib/lp 755 root lp
@@ -73,9 +72,3 @@
 d none usr/sbin 755 root bin
 f none usr/sbin/ppdmgr 0555 root lp
 s none usr/sbin/printmgr=../../usr/sadm/admin/bin/printmgr
-#
-d none var 755 root sys
-d none var/lp 775 lp lp
-d none var/lp/ppd 755 root lp
-d none var/lp/ppd/caches 755 root lp
-f none var/lp/ppd/manufaliases 444 root lp