[ooo-build-commit] .: bin/unpack patches/dev300

[Petr Mladek]

 bin/unpack                          |   12 ++++++------
 patches/dev300/ct2n-build.diff      |    3 ++-
 patches/dev300/nlpsolver-build.diff |    3 ++-
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 2ebc317592288b9baf49a090a22fda1d9c720f62
Author: Petr Mladek <pmladek at walk.suse.cz>
Date:   Tue Jul 13 19:56:28 2010 +0200

    fix build of the ct2n and nlpsolver extensions
    
    * bin/unpack: link tarballs to the name with md5sum
    * patches/dev300/ct2n-build.diff: set m5sum
    * patches/dev300/nlpsolver-build.diff: set m5sum

diff --git a/bin/unpack b/bin/unpack
index 4201d24..f681724 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -904,9 +904,9 @@ fi
 
 if test "x$CT2N_EXTENSION" != "x"; then
     check_file $SRCDIR/$CT2N_EXTENSION
-    echo "Copying ConvertTextToNumber extension into the tree"
-    mkdir -p $OOBUILDDIR/ct2n/download || exit 1
-    $GNUCP $SRCDIR/$CT2N_EXTENSION -d $OOBUILDDIR/ct2n/download || exit 1
+    echo "Linking ConvertTextToNumber extension sources to the expected name"
+    md5=`md5sum $SRCDIR/$CT2N_EXTENSION | cut -d' ' -f1`
+    ln -sf $SRCDIR/$CT2N_EXTENSION $SRCDIR/$md5-$CT2N_EXTENSION || exit 1
 fi
 
 if test "x$WATCH_WINDOW_EXTENSION" != "x"; then
@@ -925,9 +925,9 @@ fi
 
 if test "x$NLPSOLVER_EXTENSION" != "x"; then
     check_file $SRCDIR/$NLPSOLVER_EXTENSION
-    echo "Copying NLPSolver extension into the tree"
-    mkdir -p $OOBUILDDIR/nlpsolver/download || exit 1
-    $GNUCP $SRCDIR/$NLPSOLVER_EXTENSION -d $OOBUILDDIR/nlpsolver/download || exit 1
+    echo "Linking NLPSolver extension sources to the expected name"
+    md5=`md5sum $SRCDIR/$NLPSOLVER_EXTENSION | cut -d' ' -f1`
+    ln -sf $SRCDIR/$NLPSOLVER_EXTENSION $SRCDIR/$md5-$NLPSOLVER_EXTENSION || exit 1
 fi
 
 if test "x$LANGUAGETOOL_EXTENSION" != "x"; then
diff --git a/patches/dev300/ct2n-build.diff b/patches/dev300/ct2n-build.diff
index 7222edb..bf02285 100644
--- a/patches/dev300/ct2n-build.diff
+++ b/patches/dev300/ct2n-build.diff
@@ -129,7 +129,7 @@ diff -purN ct2n.old/ConvertTextToNumber-1.3.2-no-visible-by-default.patch ct2n/C
 diff -purN ct2n.old/makefile.mk ct2n/makefile.mk
 --- ct2n.old/makefile.mk	2007-04-20 17:59:41.000000000 +0200
 +++ ct2n/makefile.mk	2010-04-15 14:43:02.000000000 +0200
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,70 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -172,6 +172,7 @@ diff -purN ct2n.old/makefile.mk ct2n/makefile.mk
 +
 +# --- Files --------------------------------------------------------
 +
++TARFILE_MD5=451ccf439a36a568653b024534669971
 +TARFILE_NAME=ConvertTextToNumber-1.3.2
 +TARFILE_ROOTDIR=.
 +BUILD_DIR=.
diff --git a/patches/dev300/nlpsolver-build.diff b/patches/dev300/nlpsolver-build.diff
index 0780a0e..986c0b1 100644
--- a/patches/dev300/nlpsolver-build.diff
+++ b/patches/dev300/nlpsolver-build.diff
@@ -1,7 +1,7 @@
 diff -purN nlpsolver.old/makefile.mk nlpsolver/makefile.mk
 --- nlpsolver.old/makefile.mk	1970-01-01 01:00:00.000000000 +0100
 +++ nlpsolver/makefile.mk	2009-10-26 22:34:07.000000000 +0100
-@@ -0,0 +1,72 @@
+@@ -0,0 +1,73 @@
 +#*************************************************************************
 +#
 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,6 +46,7 @@ diff -purN nlpsolver.old/makefile.mk nlpsolver/makefile.mk
 +
 +# --- Files --------------------------------------------------------
 +
++TARFILE_MD5=90401bca927835b6fbae4a707ed187c8
 +TARFILE_NAME=nlpsolver-0.9
 +TARFILE_ROOTDIR=nlpsolver-0.9
 +