Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8957567d9cca36d9c61094ecc85f17c516f3cc3d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8957567d9cca36d9c61094ecc85f17c516f3cc3d)
  • Date: Tue, 18 Mar 2008 22:46:42 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
gnome2-apps/abiword/BUILD | 15 ++++-----------
gnome2-apps/abiword/CONFIGURE | 5 ++---
gnome2-apps/abiword/CONFLICTS | 1 -
gnome2-apps/abiword/DEPENDS | 17 +++++++++--------
gnome2-apps/abiword/DETAILS | 14 +++++++-------
gnome2-apps/abiword/HISTORY | 7 ++++++-
gnome2-apps/abiword/abiword-2.4.6.tar.bz2.sig | 0
gnome2-apps/abiword/abiword-2.6.0.tar.gz.sig |binary
9 files changed, 28 insertions(+), 31 deletions(-)

New commits:
commit 391779456e7f6eff36627eeb2114c48035ae243f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

abiword: => 2.6.0

diff --git a/gnome2-apps/abiword/BUILD b/gnome2-apps/abiword/BUILD
index 5ce2c6c..ac5e3c9 100755
--- a/gnome2-apps/abiword/BUILD
+++ b/gnome2-apps/abiword/BUILD
@@ -1,18 +1,11 @@
-if [ "$DEVEL" == "n" ]; then
-cd abi &&
-sedit "s/-pedantic -ansi//g" configure
-fi &&
-
-if [ "$THREADS" == "y" ]; then
+if [[ $THREADS == y ]]; then
OPTS="$OPTS --enable-threads"
fi &&
-if [ "$PLUGINS" == "y" ]; then
+if [[ $PLUGINS == y ]]; then
OPTS="$OPTS --enable-builtin-plugins"
fi &&
-if [ "$EOPTS" == "y" ]; then
+if [[ $EOPTS == y ]]; then
OPTS="$OPTS --enable-extra-optimization"
fi &&

-make_single &&
-default_build &&
-make_normal
+default_build
diff --git a/gnome2-apps/abiword/CONFIGURE b/gnome2-apps/abiword/CONFIGURE
index 95707d6..ead5460 100755
--- a/gnome2-apps/abiword/CONFIGURE
+++ b/gnome2-apps/abiword/CONFIGURE
@@ -1,4 +1,3 @@
-config_query THREADS "Enable Posix Threads" y &&
+config_query THREADS "Enable Posix Threads" y &&
config_query PLUGINS "Enable experimental plugins" n &&
-config_query EOPTS "Enable extra optimizations" n
-
+config_query EOPTS "Enable extra optimizations" n
diff --git a/gnome2-apps/abiword/CONFLICTS b/gnome2-apps/abiword/CONFLICTS
deleted file mode 100755
index 61fff2c..0000000
--- a/gnome2-apps/abiword/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts abiword2 y
diff --git a/gnome2-apps/abiword/DEPENDS b/gnome2-apps/abiword/DEPENDS
index 41a5f4f..f0d1a2e 100755
--- a/gnome2-apps/abiword/DEPENDS
+++ b/gnome2-apps/abiword/DEPENDS
@@ -8,14 +8,15 @@ depends popt "--with-popt" &&
depends fontconfig &&
depends libglade2 &&
depends wv "--with-sys-wv" &&
-if [ "$DEVEL" == "n" ]; then
- depends libgnomeprintui
-else
- optional_depends libgnomeprintui \
+
+optional_depends libgnomeui \
"--enable-gnomeui" \
- "--disable-gnomeui --disable-printing" \
- "for gnome and printing support"
-fi &&
+ "--disable-gnomeui" \
+ "enable use of GNOME" &&
+optional_depends libgnomeprintui \
+ "" \
+ "--disable-printing" \
+ "for printing support" &&
optional_depends imagemagick \
"--with-ImageMagick" \
"" \
@@ -42,7 +43,7 @@ optional_depends nautilus2
\
"for a nautilus view" &&
optional_depends "enchant" \
"" \
- "--disable-enchant" \
+ "--disable-spellcheck" \
"For spell checking" &&
optional_depends aspell \
"" \
diff --git a/gnome2-apps/abiword/DETAILS b/gnome2-apps/abiword/DETAILS
index 8b9c2be..b4363e3 100755
--- a/gnome2-apps/abiword/DETAILS
+++ b/gnome2-apps/abiword/DETAILS
@@ -1,15 +1,15 @@
SPELL=abiword
-if [ "$DEVEL" == "y" ] ;then
+if [[ $DEVEL == y ]]; then
VERSION=2.5.2
SOURCE=$SPELL-$VERSION.tar.gz
-
SOURCE_URL[0]=http://www.abisource.com/downloads/abiword/$VERSION/source/$SOURCE
+
SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
else
- VERSION=2.4.6
- SOURCE=$SPELL-$VERSION.tar.bz2
- SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_URL[1]=http://www.abisource.com/downloads/abiword/$VERSION/source/$SOURCE
+ VERSION=2.6.0
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=http://www.abisource.com/downloads/$SPELL/$VERSION/source/$SOURCE
+# SOURCE_URL[1]=$SOURCEFORGE_URL/$SPELL/$SOURCE
fi
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+ SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://www.abisource.com/
diff --git a/gnome2-apps/abiword/HISTORY b/gnome2-apps/abiword/HISTORY
index da173af..39235fc 100644
--- a/gnome2-apps/abiword/HISTORY
+++ b/gnome2-apps/abiword/HISTORY
@@ -1,3 +1,9 @@
+2008-03-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URLs, updated stable to 2.6.0
+ * DEPENDS: added libgnomeui as opt dep
+ * CONFLICTS: useless atm, cause there's no abiword2 spell anymore
+ * BUILD: multi-job build works fine
+
2008-01-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: cleaned up, removed UPDATED
* DEPENDS: added threaded perl as a dep (bug #11529)
@@ -257,4 +263,3 @@

2003-04-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* Initial Spell
-
diff --git a/gnome2-apps/abiword/abiword-2.4.6.tar.bz2.sig
b/gnome2-apps/abiword/abiword-2.4.6.tar.bz2.sig
deleted file mode 100644
index e3c43ca..0000000
Binary files a/gnome2-apps/abiword/abiword-2.4.6.tar.bz2.sig and /dev/null
differ
diff --git a/gnome2-apps/abiword/abiword-2.6.0.tar.gz.sig
b/gnome2-apps/abiword/abiword-2.6.0.tar.gz.sig
new file mode 100644
index 0000000..075fe77
Binary files /dev/null and b/gnome2-apps/abiword/abiword-2.6.0.tar.gz.sig
differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (8957567d9cca36d9c61094ecc85f17c516f3cc3d), Vlad Glagolev, 03/18/2008

Archive powered by MHonArc 2.6.24.

Top of Page