diff options
author | Vlad Glagolev | 2010-12-07 13:59:46 +0300 |
---|---|---|
committer | Vlad Glagolev | 2010-12-07 13:59:46 +0300 |
commit | 8313589900ceeedb3f5d94f68bd3946621540e7c (patch) | |
tree | c46be169d7c1c008a414a34238e815da3b5fe2ee /cluster | |
parent | 2fe555552aa918594235c063c4178e059dece55e (diff) |
ocfs2-tools: => 1.4.3
Diffstat (limited to 'cluster')
-rwxr-xr-x | cluster/ocfs2-tools/BUILD | 17 | ||||
-rwxr-xr-x | cluster/ocfs2-tools/CONFIGURE | 4 | ||||
-rwxr-xr-x | cluster/ocfs2-tools/DEPENDS | 11 | ||||
-rwxr-xr-x | cluster/ocfs2-tools/DETAILS | 9 | ||||
-rw-r--r-- | cluster/ocfs2-tools/HISTORY | 6 |
5 files changed, 25 insertions, 22 deletions
diff --git a/cluster/ocfs2-tools/BUILD b/cluster/ocfs2-tools/BUILD index 3360a9602f..09712c48ca 100755 --- a/cluster/ocfs2-tools/BUILD +++ b/cluster/ocfs2-tools/BUILD @@ -1,13 +1,3 @@ -local MY_OPTS="--enable-dynamic-ctl --enable-dynamic-fsck ${OPTS}" && - -unset OPTS && - -if [ "$OCFS2_CONSOLE" == "y" ]; then - MY_OPTS="--enable-ocfs2console=yes ${MY_OPTS}" -else - MY_OPTS="--enable-ocfs2console=no --disable-glibtest ${MY_OPTS}" -fi && - ./configure --build=$BUILD \ --prefix=${INSTALL_ROOT}/usr \ --infodir=${INSTALL_ROOT}/usr/share/info \ @@ -17,6 +7,9 @@ fi && --localstatedir=${INSTALL_ROOT}/var \ --enable-dynamic-ctl \ --enable-dynamic-fsck \ - $MY_OPTS && + --disable-glibtest \ + $OCFS2_TOOLS_OPTS && -make +make_single && +make && +make_normal diff --git a/cluster/ocfs2-tools/CONFIGURE b/cluster/ocfs2-tools/CONFIGURE index 910867a681..40e9682540 100755 --- a/cluster/ocfs2-tools/CONFIGURE +++ b/cluster/ocfs2-tools/CONFIGURE @@ -1 +1,3 @@ -config_query OCFS2_CONSOLE "Build GUI frontend?" n +config_query_option OCFS2_TOOLS_OPTS "Build GUI frontend?" n \ + "--enable-ocfs2console=yes" \ + "--enable-ocfs2console=no" diff --git a/cluster/ocfs2-tools/DEPENDS b/cluster/ocfs2-tools/DEPENDS index fcf03b5694..3fbe729925 100755 --- a/cluster/ocfs2-tools/DEPENDS +++ b/cluster/ocfs2-tools/DEPENDS @@ -1,8 +1,9 @@ -depends e2fsprogs && -depends pkg-config && +depends e2fsprogs && +depends pkgconfig && depends glib2 && -if [ "$OCFS2_CONSOLE" == "y" ]; then - depends pygtk2 && - depends vte +if list_find "$OCFS2_TOOLS_OPTS" "--enable-ocfs2console=yes"; then + depends python && + depends pygtk2 && + depends vte fi diff --git a/cluster/ocfs2-tools/DETAILS b/cluster/ocfs2-tools/DETAILS index 5ab67bb9f0..2b0f5db37b 100755 --- a/cluster/ocfs2-tools/DETAILS +++ b/cluster/ocfs2-tools/DETAILS @@ -1,9 +1,10 @@ SPELL=ocfs2-tools - VERSION=1.4.1 + VERSION=1.4.3 + BRANCH=`echo $VERSION|cut -d . -f 1,2` SOURCE=${SPELL}-${VERSION}.tar.gz - SOURCE_URL[0]=http://oss.oracle.com/projects/${SPELL}/dist/files/source/v1.4/${SOURCE} - SOURCE_HASH=sha512:ad86c659182bf0326752460d8204e4e4eb049e5edef19427464344791b2c095020f03cfb9c2cf2784e944c07c90133b07474e6d5eb3accc1c1cffe9f8d71d957 -SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION} + SOURCE_URL[0]=http://oss.oracle.com/projects/${SPELL}/dist/files/source/v${BRANCH}/${SOURCE} + SOURCE_HASH=sha512:2e6ea142c0d0891fb57141f75b9cae223d82e5a9a839a43b0f9ec205bfc0fd7ac8d74bacff702371d0b22bcbf82a218c8e1256c45c4c90523ed3f80e91724a6d +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE=http://oss.oracle.com/projects/${SPELL} ENTERED=20060711 LICENSE[0]=GPL diff --git a/cluster/ocfs2-tools/HISTORY b/cluster/ocfs2-tools/HISTORY index f5892da7cc..905c6559d7 100644 --- a/cluster/ocfs2-tools/HISTORY +++ b/cluster/ocfs2-tools/HISTORY @@ -1,3 +1,9 @@ +2010-12-07 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: updated spell to 1.4.3; use BRANCH + * DEPENDS: fixed pkconfig dependency name + * CONFIGURE: use OCFS2_TOOLS_OPTS + * BUILD: fixed OPTS usage, multijob build + 2008-12-14 David Kowis <dkowis@shlrm.org> * DETAILS: updated to 1.4.1 * DEPENDS: needs pkgconfig and glib2 always now |