OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Feb-2005 17:24:53
Branch: HEAD Handle: 2005020916245200
Modified files:
openpkg-src/aspell aspell.patch aspell.spec
Log:
fix determination of tool paths. Submitted by Bill Campbell.
Summary:
Revision Changes Path
1.7 +81 -0 openpkg-src/aspell/aspell.patch
1.43 +1 -1 openpkg-src/aspell/aspell.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/aspell/aspell.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 aspell.patch
--- openpkg-src/aspell/aspell.patch 8 Nov 2004 12:53:06 -0000 1.6
+++ openpkg-src/aspell/aspell.patch 9 Feb 2005 16:24:52 -0000 1.7
@@ -10,3 +10,84 @@
filterdir = ${pkglibdir}
optdir = ${pkgdatadir}
localedir = ${datadir}/locale
+diff -uNr ../aspell-0.60.2.orig/aspell6-de-20030222-1/configure
./aspell6-de-20030222-1/configure
+--- ../aspell-0.60.2.orig/aspell6-de-20030222-1/configure 2004-11-03
18:46:10.000000000 -0800
++++ ./aspell6-de-20030222-1/configure 2005-01-27 17:28:10.000000000
-0800
+@@ -66,9 +66,9 @@
+
+ #echo $ASPELL
+ if test x = "x$ASPELL"
+- then ASPELL=aspell; fi
++ then ASPELL=`which aspell`; fi
+ if test x = "x$PREZIP"
+- then PREZIP=prezip-bin; fi
++ then PREZIP=`which prezip-bin`; fi
+ #echo $ASPELL
+
+ echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
+@@ -79,9 +79,9 @@
+ datadir=`$ASPELL dump config data-dir`
+ echo $datadir
+
+-echo "ASPELL = `which $ASPELL`" > Makefile
++echo "ASPELL = $ASPELL" > Makefile
+ echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
+-echo "PREZIP = `which $PREZIP`" >> Makefile
++echo "PREZIP = $PREZIP" >> Makefile
+ echo "DESTDIR = $DESTDIR" >> Makefile
+ echo "dictdir = $dictdir" >> Makefile
+ echo "datadir = $datadir" >> Makefile
+diff -uNr ../aspell-0.60.2.orig/aspell6-de-alt-2.1-1/configure
./aspell6-de-alt-2.1-1/configure
+--- ../aspell-0.60.2.orig/aspell6-de-alt-2.1-1/configure 2004-11-03
18:48:55.000000000 -0800
++++ ./aspell6-de-alt-2.1-1/configure 2005-01-27 17:28:54.000000000 -0800
+@@ -66,9 +66,9 @@
+
+ #echo $ASPELL
+ if test x = "x$ASPELL"
+- then ASPELL=aspell; fi
++ then ASPELL=`which aspell`; fi
+ if test x = "x$PREZIP"
+- then PREZIP=prezip-bin; fi
++ then PREZIP=`which prezip-bin`; fi
+ #echo $ASPELL
+
+ echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
+@@ -79,9 +79,9 @@
+ datadir=`$ASPELL dump config data-dir`
+ echo $datadir
+
+-echo "ASPELL = `which $ASPELL`" > Makefile
++echo "ASPELL = $ASPELL" > Makefile
+ echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
+-echo "PREZIP = `which $PREZIP`" >> Makefile
++echo "PREZIP = $PREZIP" >> Makefile
+ echo "DESTDIR = $DESTDIR" >> Makefile
+ echo "dictdir = $dictdir" >> Makefile
+ echo "datadir = $datadir" >> Makefile
+diff -uNr ../aspell-0.60.2.orig/aspell6-en-6.0-0/configure
./aspell6-en-6.0-0/configure
+--- ../aspell-0.60.2.orig/aspell6-en-6.0-0/configure 2004-08-10
02:01:33.000000000 -0700
++++ ./aspell6-en-6.0-0/configure 2005-01-27 17:29:27.000000000 -0800
+@@ -66,9 +66,9 @@
+
+ #echo $ASPELL
+ if test x = "x$ASPELL"
+- then ASPELL=aspell; fi
++ then ASPELL=`which aspell`; fi
+ if test x = "x$PREZIP"
+- then PREZIP=prezip-bin; fi
++ then PREZIP=`which prezip-bin`; fi
+ #echo $ASPELL
+
+ echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
+@@ -79,9 +79,9 @@
+ datadir=`$ASPELL dump config data-dir`
+ echo $datadir
+
+-echo "ASPELL = `which $ASPELL`" > Makefile
++echo "ASPELL = $ASPELL" > Makefile
+ echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
+-echo "PREZIP = `which $PREZIP`" >> Makefile
++echo "PREZIP = $PREZIP" >> Makefile
+ echo "DESTDIR = $DESTDIR" >> Makefile
+ echo "dictdir = $dictdir" >> Makefile
+ echo "datadir = $datadir" >> Makefile
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/aspell/aspell.spec
============================================================================
$ cvs diff -u -r1.42 -r1.43 aspell.spec
--- openpkg-src/aspell/aspell.spec 25 Jan 2005 18:52:09 -0000 1.42
+++ openpkg-src/aspell/aspell.spec 9 Feb 2005 16:24:52 -0000 1.43
@@ -41,7 +41,7 @@
Group: Text
License: GPL
Version: %{V_aspell}
-Release: 20050125
+Release: 20050209
# package options
%option with_perl no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
