summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--[-rwxr-xr-x]java/jakarta-struts-bin/DETAILS11
-rw-r--r--java/jakarta-struts-bin/HISTORY3
-rwxr-xr-xjava/jakarta-struts-bin/INSTALL4
3 files changed, 10 insertions, 8 deletions
diff --git a/java/jakarta-struts-bin/DETAILS b/java/jakarta-struts-bin/DETAILS
index cbd89b1ac6..d6853e5e0d 100755..100644
--- a/java/jakarta-struts-bin/DETAILS
+++ b/java/jakarta-struts-bin/DETAILS
@@ -1,10 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_NAME=struts
- SPELL=${PKG_PROJECT}-${PKG_NAME}-bin
+ SPELL=jakarta-struts-bin
+ SPELLX=${SPELL%-bin}
VERSION=1.1-rc1
- SOURCE=${PKG_PROJECT}-${PKG_NAME}-${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_PROJECT}-${PKG_NAME}-${VERSION}
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_NAME}/binaries/${SOURCE}
+ SOURCE=$SPELL-$VERSION.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELLX/-/\/}/binaries/$SOURCE
SOURCE_HASH=sha512:901d24bcc799d170cd03ddb8a4fe731b98a6ec4de7223864cafc02f5414a0c2f3976b48fd2886f4eabfe4869ecb835c2896b72752e4fc2efe5f68ec2859616c7
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/struts/index.html
diff --git a/java/jakarta-struts-bin/HISTORY b/java/jakarta-struts-bin/HISTORY
index 0517372302..210e089c1a 100644
--- a/java/jakarta-struts-bin/HISTORY
+++ b/java/jakarta-struts-bin/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
2006-09-21 Juuso Alasuutari <iuso@sourcemage.org>
* PROVIDES: [automated] Fixed invalid entries.
diff --git a/java/jakarta-struts-bin/INSTALL b/java/jakarta-struts-bin/INSTALL
index 6a991189f0..4f387d4722 100755
--- a/java/jakarta-struts-bin/INSTALL
+++ b/java/jakarta-struts-bin/INSTALL
@@ -1,4 +1,4 @@
. $SECTION_DIRECTORY/java-functions &&
-extract_jakarta_src ${PKG_NAME} ${PKG_NAME}-${VERSION} $SOURCE_DIRECTORY &&
-register_jakarta_jar ${PKG_NAME}-${VERSION}/lib/struts.jar struts.jar
+extract_jakarta_src ${SPELL##*-} ${SPELL##*-}-${VERSION} $SOURCE_DIRECTORY &&
+register_jakarta_jar ${SPELL##*-}-${VERSION}/lib/struts.jar struts.jar