--- a/components/rdiff-backup/rdiff-backup-27.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/rdiff-backup/rdiff-backup-27.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,36 +18,36 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
-set name=pkg.fmri value=pkg:/backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/backup/rdiff-backup-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Local/remote mirror and incremental backup utility"
-set name=com.oracle.info.description value="Python 2.7 bindings for rdiff-backup"
+set name=com.oracle.info.description \
+ value="Python 2.7 bindings for rdiff-backup"
set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.classification \
+ value="org.opensolaris.category.2008:Applications/System Utilities"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2008/272
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/272
-
-license rdiff-backup.copyright license="GPLv2"
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/lib
-dir path=usr/lib/python2.7
-dir path=usr/lib/python2.7/vendor-packages
-dir path=usr/lib/python2.7/vendor-packages/rdiff_backup
-
+dir path=usr
+dir path=usr/bin
+link path=usr/bin/rdiff-backup target=rdiff-backup-2.7 mediator=python \
+ mediator-version=2.7
file build/$(MACH32)-2.7/scripts-2.7/rdiff-backup \
- path=usr/bin/rdiff-backup-2.7 \
- pkg.depend.bypass-generate=.*msvcrt.*
+ path=usr/bin/rdiff-backup-2.7 pkg.depend.bypass-generate=.*msvcrt.*
+link path=usr/bin/rdiff-backup-statistics target=rdiff-backup-statistics-2.7 \
+ mediator=python mediator-version=2.7
file build/$(MACH32)-2.7/scripts-2.7/rdiff-backup-statistics \
path=usr/bin/rdiff-backup-statistics-2.7
-file \
- path=usr/lib/python2.7/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py2.7.egg-info
+dir path=usr/lib
+dir path=usr/lib/python2.7
+dir path=usr/lib/python2.7/vendor-packages
+dir path=usr/lib/python2.7/vendor-packages/rdiff_backup
+file path=usr/lib/python2.7/vendor-packages/rdiff_backup-$(COMPONENT_VERSION)-py2.7.egg-info
file path=usr/lib/python2.7/vendor-packages/rdiff_backup/C.so
file path=usr/lib/python2.7/vendor-packages/rdiff_backup/FilenameMapping.py
file path=usr/lib/python2.7/vendor-packages/rdiff_backup/Globals.py
@@ -84,17 +84,12 @@
file path=usr/lib/python2.7/vendor-packages/rdiff_backup/statistics.py
file path=usr/lib/python2.7/vendor-packages/rdiff_backup/user_group.py
file path=usr/lib/python2.7/vendor-packages/rdiff_backup/win_acls.py
-
-link path=usr/bin/rdiff-backup target=rdiff-backup-2.7 \
- mediator=python mediator-version=2.7
-
-link path=usr/bin/rdiff-backup-statistics target=rdiff-backup-statistics-2.7 \
- mediator=python mediator-version=2.7
+license rdiff-backup.copyright license=GPLv2
# force a dependency on the Python 2.7 runtime
-depend fmri=__TBD pkg.debug.depend.file=python2.7 \
- pkg.debug.depend.path=usr/bin type=require
+depend type=require fmri=__TBD pkg.debug.depend.file=python2.7 \
+ pkg.debug.depend.path=usr/bin
# force a dependency on the rdiff-backup package
-depend fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- type=require
+depend type=require \
+ fmri=backup/rdiff-backup@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)