--- a/components/wireshark/wireshark-common.p5m Tue Jul 15 07:20:42 2014 -0700
+++ b/components/wireshark/wireshark-common.p5m Wed Jul 23 01:24:03 2014 -0700
@@ -26,7 +26,7 @@
value=pkg:/diagnostic/wireshark/wireshark-common@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="Libraries and Tools used by Wireshark and TShark Network protocol analyzers"
set name=com.oracle.info.description value="the Wireshark and TShark common libraries and tools"
-set name=com.oracle.info.tpno value=17414
+set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value=org.opensolaris.category.2008:Applications/Internet
set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
@@ -35,8 +35,8 @@
value=PSARC/2007/334
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
file exec_attr.dumpcap path=etc/security/exec_attr.d/diagnostic:wireshark:wireshark-common
-file path=usr/lib/$(MACH64)/libwireshark.so.3.1.7
-file path=usr/lib/$(MACH64)/libwiretap.so.3.0.7
+file path=usr/lib/$(MACH64)/libwireshark.so.3.1.$(MICRO_VERSION)
+file path=usr/lib/$(MACH64)/libwiretap.so.3.0.$(MICRO_VERSION)
file path=usr/lib/$(MACH64)/libwsutil.so.3.0.0
file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/asn1.so
file path=usr/lib/$(MACH64)/wireshark/plugins/$(IPS_COMPONENT_VERSION)/docsis.so
@@ -285,10 +285,10 @@
file path=usr/share/wireshark/ws.css
license COPYING license=GPLv2
-link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.7
-link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.7
-link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.7
-link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.7
+link path=usr/lib/$(MACH64)/libwireshark.so target=libwireshark.so.3.1.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwireshark.so.3 target=libwireshark.so.3.1.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwiretap.so target=libwiretap.so.3.0.$(MICRO_VERSION)
+link path=usr/lib/$(MACH64)/libwiretap.so.3 target=libwiretap.so.3.0.$(MICRO_VERSION)
link path=usr/lib/$(MACH64)/libwsutil.so target=libwsutil.so.3.0.0
link path=usr/lib/$(MACH64)/libwsutil.so.3 target=libwsutil.so.3.0.0