[Lunar-commits] <moonbase> gnumeric: cleanup, and get out of /opt

[Zachary McGrew]

commit 0d9d8cc87177c9ed851bd333f6fe02c12a19b7e4
Author: Paul Bredbury <brebs at sent.com>
Date:   Sat Mar 7 11:16:52 2009 -0800

    gnumeric: cleanup, and get out of /opt
    
    Compiled and runs fine here. -zmcgrew
---
 gnome2/apps/gnumeric/BUILD                 |   15 ---------------
 gnome2/apps/gnumeric/DEPENDS               |   18 +++++++++---------
 gnome2/apps/gnumeric/DETAILS               |   10 +++++-----
 gnome2/apps/gnumeric/profile.d/gnumeric.rc |    8 --------
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/gnome2/apps/gnumeric/BUILD b/gnome2/apps/gnumeric/BUILD
index c65655e..e69de29 100644
--- a/gnome2/apps/gnumeric/BUILD
+++ b/gnome2/apps/gnumeric/BUILD
@@ -1,15 +0,0 @@
-(
-
-    ./configure --sysconfdir=/etc                               \
-                --prefix=/opt/lunar/$MOD                        \
-                --localstatedir=/var                            \
-                --infodir=/opt/lunar/$MOD/share/info            \
-                --mandir=/opt/lunar/$MOD/share/man              \
-                --with-graphs                                   \
-                $OPTS                                           &&
-
-   default_make                                                 &&
-   install -m 755 -d /usr/share/pixmaps/                        &&
-   cp /opt/lunar/$MOD/share/pixmaps/gnome-gnumeric.png /usr/share/pixmaps/
-
-) > $C_FIFO 2>&1
diff --git a/gnome2/apps/gnumeric/DEPENDS b/gnome2/apps/gnumeric/DEPENDS
index 64b2447..2ad5d58 100644
--- a/gnome2/apps/gnumeric/DEPENDS
+++ b/gnome2/apps/gnumeric/DEPENDS
@@ -1,30 +1,30 @@
-depends  libgnomeprintui  &&
-depends  goffice          &&
+depends  libgnomeprintui
+depends  goffice
 
-optional_depends  libgnomedb    ""  ""                 "enable gnome-db for gnumeric"  &&
-optional_depends  scrollkeeper  ""  "--without-gnome"  "enable cataloging system"      &&
+optional_depends  libgnomedb    ""  ""                 "enable gnome-db for gnumeric"
+optional_depends  scrollkeeper  ""  "--without-gnome"  "enable cataloging system"
 
 optional_depends  "pygtk" \
                   "--with-python" \
                   "--without-python" \
-                  "Compile the Python plugin loader"  &&
+                  "compile the Python plugin loader"
 
 optional_depends  "perl" \
                   "--with-perl" \
                   "--without-perl" \
-                  "Compile the Perl plugin loader"  &&
+                  "compile the Perl plugin loader"
 
 optional_depends  "libgda2" \
                   "--with-gda" \
                   "--without-gda" \
-                  "Compile the Gnome Database Access plugin"  &&
+                  "compile the Gnome Database Access plugin"
 
 optional_depends  "psiconv" \
                   "--with-psiconv" \
                   "--without-psiconv" \
-                  "Compile with Psiconv support"  &&
+                  "compile with Psiconv support"
 
 optional_depends  "libgnomeui" \
                   "--with-gnome" \
                   "--without-gnome" \
-                  "Compile with gnome support"
+                  "compile with gnome support"
diff --git a/gnome2/apps/gnumeric/DETAILS b/gnome2/apps/gnumeric/DETAILS
index 43dec0c..7d08112 100644
--- a/gnome2/apps/gnumeric/DETAILS
+++ b/gnome2/apps/gnumeric/DETAILS
@@ -1,19 +1,19 @@
           MODULE=gnumeric
-         VERSION=1.8.3
+         VERSION=1.8.4
           SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=$GNOME_URL/sources/$MODULE/1.8/
-      SOURCE_VFY=sha1:5a6585549bd705bf1d0e590981c3ef38173f8c08
+      SOURCE_VFY=sha1:2d765b0d06509e0695c4d3ec96b94f8acba88735
         WEB_SITE=http://www.gnumeric.org
          ENTERED=20021224
-         UPDATED=20080702
+         UPDATED=20090222
            SHORT="the GNOME spreadsheet application"
 
 cat << EOF
 Gnumeric is a powerful spreadsheet application that interoperates well
 with other spreadsheets.  It comes with plugins that enable it to deal
-with commonly used spreadsheet file formats.  Gnumeric is intended to
-be a drop in replacement for commercial spreadsheets.
+with commonly-used spreadsheet file formats.  Gnumeric is intended to
+be a drop-in replacement for commercial spreadsheets.
 
 Gnumeric will import your existing Excel, 1-2-3, Applix, Sylk, XBase 
 and Oleo files.  Gnumeric can export to LaTeX 2e (.tex), TROFF (.me)
diff --git a/gnome2/apps/gnumeric/profile.d/gnumeric.rc b/gnome2/apps/gnumeric/profile.d/gnumeric.rc
index 0c350af..e69de29 100644
--- a/gnome2/apps/gnumeric/profile.d/gnumeric.rc
+++ b/gnome2/apps/gnumeric/profile.d/gnumeric.rc
@@ -1,8 +0,0 @@
-export PATH=$PATH:/opt/lunar/gnumeric/bin
-
-# We need a little logic otherwise this might break
-if [ -z $XDG_DATA_DIRS ] ; then
-  export XDG_DATA_DIRS="/usr/share:/opt/lunar/gnumeric/share"
-else
-  export XDG_DATA_DIRS="$XDG_DATA_DIRS:/opt/lunar/gnumeric/share"
-fi