23247687 ProFTPd: pkg ver. fix after - update to 1.3.5b
authorJiri Sasek <Jiri.Sasek@Oracle.COM>
Mon, 09 May 2016 00:53:38 -0700
changeset 5972 e58388dcef63
parent 5971 065a45513062
child 5973 e70390875a14
23247687 ProFTPd: pkg ver. fix after - update to 1.3.5b
components/proftpd/Makefile
components/proftpd/proftpd.p5m
--- a/components/proftpd/Makefile	Wed Apr 27 14:09:04 2016 -0700
+++ b/components/proftpd/Makefile	Mon May 09 00:53:38 2016 -0700
@@ -54,9 +54,9 @@
 
 # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not
 # enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow.
-# Because the IPS_COMPONENT_VERSION cannot contain letters we used '.0.5'
-# instead of 'e'.
-IPS_COMPONENT_VERSION=  $(COMPONENT_VERSION)
+# Because the IPS_COMPONENT_VERSION cannot contain letters
+# ...we will use '.2' instead of 'b'.
+IPS_COMPONENT_VERSION=  $(COMPONENT_VERSION).2
 
 CFLAGS += -I$(USRINCDIR)/kerberosv5 -DHAVE_KRB5_H=1 -DKRB5_DLLIMP= -DHAVE__GETGRPSBYMEMBER -D_SOLARIS_DTRACE
 ifeq ($(OS_VERSION), 5.11)
--- a/components/proftpd/proftpd.p5m	Wed Apr 27 14:09:04 2016 -0700
+++ b/components/proftpd/proftpd.p5m	Mon May 09 00:53:38 2016 -0700
@@ -215,4 +215,4 @@
 license proftpd.license license="GPLv2 (proftpd)" \
     com.oracle.info.description="the ProFTPD server and utilities" \
     com.oracle.info.name=proftpd com.oracle.info.tpno=$(TPNO_PROFTPD) \
-    com.oracle.info.version=$(COMPONENT_VERSION)
+    com.oracle.info.version=$(HUMAN_VERSION)