From 7b4d20aad35cfb3aa777ae44ab34bad8d32bcc3b Mon Sep 17 00:00:00 2001
From: Ismael Luceno
Date: Mon, 22 Dec 2014 17:05:56 -0300
Subject: jakarta-commons-logging: Normalize SPELL field and remove PKG_*
 variables

---
 java/jakarta-commons-logging/DETAILS | 13 +++++--------
 java/jakarta-commons-logging/HISTORY |  3 +++
 java/jakarta-commons-logging/INSTALL |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
 mode change 100755 => 100644 java/jakarta-commons-logging/DETAILS

(limited to 'java')

diff --git a/java/jakarta-commons-logging/DETAILS b/java/jakarta-commons-logging/DETAILS
old mode 100755
new mode 100644
index 8c079267e9..e027bc406c
--- a/java/jakarta-commons-logging/DETAILS
+++ b/java/jakarta-commons-logging/DETAILS
@@ -1,12 +1,9 @@
-     PKG_PROJECT=jakarta
-      PKG_SUBPRJ=commons
-        PKG_NAME=logging
-           SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+           SPELL=jakarta-commons-logging
          VERSION=1.0.2
-          SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
-   SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
-   SOURCE_URL[1]=http://archive.apache.org/dist/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
+          SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+   SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
+   SOURCE_URL[1]=http://archive.apache.org/dist/commons/${SPELL##*-}/source/$SOURCE
      SOURCE_HASH=sha512:acabf10b27965cffc71bc920e6643fb66d555b827bd4387c65c8d6c08a9ea79644041321958935da310583567212d46691c925ef2d1879629a8bc473148cf1b2
       LICENSE[0]=APACHE
         WEB_SITE=http://jakarta.apache.org/commons/logging.html
diff --git a/java/jakarta-commons-logging/HISTORY b/java/jakarta-commons-logging/HISTORY
index 19eb83ee1d..4ad6ca6c32 100644
--- a/java/jakarta-commons-logging/HISTORY
+++ b/java/jakarta-commons-logging/HISTORY
@@ -1,3 +1,6 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+	* DETAILS, INSTALL: Normalize SPELL field and remove PKG_* variables
+
 2011-10-14 Bor Kraljič <pyrobor@ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 
diff --git a/java/jakarta-commons-logging/INSTALL b/java/jakarta-commons-logging/INSTALL
index 814e61e18f..7f408405b6 100755
--- a/java/jakarta-commons-logging/INSTALL
+++ b/java/jakarta-commons-logging/INSTALL
@@ -1,10 +1,10 @@
-extract_jakarta_src  ${PKG_SUBPRJ}-${PKG_NAME}             \
-                     ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}  \
+extract_jakarta_src  ${SPELL#*-}             \
+                     ${SPELL#*-}-${VERSION}  \
                      $SOURCE_DIRECTORY/logging/dist        &&
 
 register_jakarta_jar                                            \
-  ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-logging-api.jar  \
+  ${SPELL#*-}-${VERSION}/commons-logging-api.jar  \
   commons-logging-api.jar                                       &&
 
-register_jakarta_jar  ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/commons-logging.jar \
+register_jakarta_jar  ${SPELL#*-}-${VERSION}/commons-logging.jar \
                       commons-logging.jar
-- 
cgit v1.2.3