25100431 One of the GNU readline license actions has the wrong version number
authorRich Burridge <rich.burridge@oracle.com>
Tue, 15 Nov 2016 16:45:54 -0800
changeset 7313 e3f0d48b9f51
parent 7312 6b323adaf9e7
child 7314 014a673c1f62
25100431 One of the GNU readline license actions has the wrong version number
components/readline/Makefile
components/readline/readline.p5m
--- a/components/readline/Makefile	Tue Nov 15 16:34:39 2016 -0800
+++ b/components/readline/Makefile	Tue Nov 15 16:45:54 2016 -0800
@@ -107,6 +107,8 @@
 $(BUILD_DIR_32)/.installed:     $(BUILD_OLD_DIR_32)/.installed
 $(BUILD_DIR_64)/.installed:     $(BUILD_OLD_DIR_64)/.installed
 
+PKG_MACROS +=	COMPONENT_VERSION_1=$(COMPONENT_VERSION_1)
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
--- a/components/readline/readline.p5m	Tue Nov 15 16:34:39 2016 -0800
+++ b/components/readline/readline.p5m	Tue Nov 15 16:45:54 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -69,7 +69,7 @@
 license readline-5.license license=GPLv2 \
     com.oracle.info.description="GNU readline version 5 libraries" \
     com.oracle.info.name=readline com.oracle.info.tpno=$(TPNO_V5) \
-    com.oracle.info.version=$(COMPONENT_VERSION)
+    com.oracle.info.version=$(COMPONENT_VERSION_1)
 license readline.license license="GPLv3, FDLv1.3" \
     com.oracle.info.description="GNU readline" com.oracle.info.name=readline \
     com.oracle.info.tpno=$(TPNO_V6) \