gnumeric: updated to 1.12.9

7 files changed, 37 insertions, 49 deletions

diff --git a/gnome2-apps/gnumeric/CONFIGURE b/gnome2-apps/gnumeric/CONFIGURE
index 204d7ff290..2a23419863 100755
--- a/gnome2-apps/gnumeric/CONFIGURE
+++ b/gnome2-apps/gnumeric/CONFIGURE
@@ -1,12 +1 @@
-#if [[ -z $SSCONVERT ]]; then
-## not configured yet, get old config data from gnumeric2 spell
-#  persistent_read gnumeric2 SSCONVERT SSCONVERT
-#  persistent_read gnumeric2 SSINDEX SSINDEX
-#  persistent_read gnumeric2 SOLVER SOLVER
-#  persistent_read gnumeric2 LONGDOUBLE LONGDOUBLE
-#  persistent_add SSCONVERT SSINDEX SOLVER LONGDOUBLE
-#fi  &&
-config_query SSCONVERT  "Build ssconvert (cmd line sreadsheet conversion tool)?" y  &&
-config_query SSINDEX    "Build ssindex (spreadsheet indexer for beagle)?" n         &&
-config_query SOLVER     "Compile the solver?" y                                     &&
 config_query LONGDOUBLE "Use long double for floating point?" n                     
diff --git a/gnome2-apps/gnumeric/DEPENDS b/gnome2-apps/gnumeric/DEPENDS
index 63a2440445..33659afe23 100755
--- a/gnome2-apps/gnumeric/DEPENDS
+++ b/gnome2-apps/gnumeric/DEPENDS
@@ -1,50 +1,39 @@
 . "$GRIMOIRE/FUNCTIONS" &&
 
+depends  glib2        &&
+depends  gtk+3        &&
 depends  intltool     &&
-depends  libole2-2    &&
-depends  libglade2    &&
 depends  libgsf       &&
-
-depends goffice &&
-
-if spell_ok goffice && is_version_less $(installed_version goffice) 0.8.11; then
-  force_depends goffice
-fi &&
-
+depends  goffice      &&
 depends  libxml2      &&
-depends  cairo &&
-depends  -sub SVG cairo &&
 
-optional_depends  gtk+2                                \
+optional_depends  gtk+3                                \
                   "--with-gtk"                         \
                   "--without-gtk"                      \
-                  "Build UI?"                          &&
+                  "Build the UI?"                      &&
 
-optional_depends  perl                                 \
-                  "--with-perl"                        \
-                  "--without-perl"                     \
-                  "Compile the Perl plugin loader?"    &&
-
-if is_depends_enabled $SPELL perl; then
-  depends xml-parser-expat
-fi &&
+optional_depends  gobject-introspection                \
+                  "--enable-introspection"             \
+                  "--disable-introspection"            \
+                  "Enable introspection support?"      &&
 
 optional_depends  psiconv                              \
                   "--with-psiconv"                     \
                   "--without-psiconv"                  \
-                  "Compile with psiconv?"              &&
+                  "Build with psiconv support?"        &&
 
-optional_depends  libgnomedb3                          \
+optional_depends  libgda5                              \
                   "--with-gda"                         \
                   "--without-gda"                      \
                   "for database support"               &&
 
-optional_depends  rarian                               \
-                  ""                                   \
-                  ""                                   \
-                  "register with rarian"               &&
+optional_depends  perl                                 \
+                  "--with-perl"                        \
+                  "--without-perl"                     \
+                  "Compile the Perl plugin loader?"    &&
 
 optional_depends  python                               \
                   "--with-python"                      \
                   "--without-python"                   \
                   "Compile the Python plugin loader?"
+
diff --git a/gnome2-apps/gnumeric/DETAILS b/gnome2-apps/gnumeric/DETAILS
index 017806a504..676e45b903 100755
--- a/gnome2-apps/gnumeric/DETAILS
+++ b/gnome2-apps/gnumeric/DETAILS
@@ -1,19 +1,12 @@
            SPELL=gnumeric
-if [[ $GNUMERIC_DEVEL == y ]]; then
-         VERSION=1.10.17
-#     SOURCE_HASH=sha512:e2f7984f869dbfaf9a5fdeee0aae544a0070c1e4edac3ffb085fb196ef1fb1e40df6f922bc9ec1eeb67ee3d2dd0b28aaf9ec2731e7120c1d485617bd0ad4d7ce
-          SOURCE=$SPELL-$VERSION.tar.bz2
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig
-else
-         VERSION=1.10.17
-          SOURCE=$SPELL-$VERSION.tar.bz2
-      SOURCE_GPG=gurus.gpg:$SOURCE.sig
-fi
+         VERSION=1.12.9
+          SOURCE=$SPELL-$VERSION.tar.xz
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+     SOURCE_HASH=sha512:ee614f1936c1f30c483245182cf58b0a8bfaaf3eb18af4eff0adea59f0881ba4284957db14459a5b397e16c08ec1284aa8273da12f819d477c78215fb4ffcd14
    SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
       LICENSE[0]=GPL
-        WEB_SITE=http://www.gnome.org/projects/gnumeric
+        WEB_SITE=https://projects.gnome.org/gnumeric/
          ENTERED=20020513
            SHORT="GNOME spreadsheet"
 cat << EOF
diff --git a/gnome2-apps/gnumeric/HISTORY b/gnome2-apps/gnumeric/HISTORY
index ffd69dbd1c..875566690b 100644
--- a/gnome2-apps/gnumeric/HISTORY
+++ b/gnome2-apps/gnumeric/HISTORY
@@ -1,3 +1,9 @@
+2014-01-25 Robin Cook <rcook@wyms.net>
+	* DETAILS: updated to 1.12.9, corrected WEB_SITE
+	* CONFIGURE: remove no longer valid configure options
+	* DEPENDS: updated to new dependencies
+	* PRE_BUILD: apply patch to fix gnumeric.desktop file
+
 2012-09-19 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Depends on libglade2, intltool
 	  Disable GNOME support (see Bug #444)
diff --git a/gnome2-apps/gnumeric/PRE_BUILD b/gnome2-apps/gnumeric/PRE_BUILD
index 81b94f5493..1452c63758 100755
--- a/gnome2-apps/gnumeric/PRE_BUILD
+++ b/gnome2-apps/gnumeric/PRE_BUILD
@@ -1,6 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
+patch -p1 < $SPELL_DIRECTORY/gnumeric-1.12.9-desktop.patch &&
+
 if ! is_depends_enabled $SPELL rarian; then
   sed -i "s:install-data-hook\: install-data-hook-omf::" doc/C/Makefile.in
 fi
diff --git a/gnome2-apps/gnumeric/gnumeric-1.10.17.tar.bz2.sig b/gnome2-apps/gnumeric/gnumeric-1.10.17.tar.bz2.sig
deleted file mode 100644
index 546a49e7bb..0000000000
--- a/gnome2-apps/gnumeric/gnumeric-1.10.17.tar.bz2.sig
+++ /dev/null
diff --git a/gnome2-apps/gnumeric/gnumeric-1.12.9-desktop.patch b/gnome2-apps/gnumeric/gnumeric-1.12.9-desktop.patch
new file mode 100644
index 0000000000..8e51ac4149
--- /dev/null
+++ b/gnome2-apps/gnumeric/gnumeric-1.12.9-desktop.patch
@@ -0,0 +1,9 @@
+diff -ur gnumeric-1.12.9/gnumeric.desktop.in gnumeric-mod/gnumeric.desktop.in
+--- gnumeric-1.12.9/gnumeric.desktop.in	2013-07-25 18:33:41.000000000 -0500
++++ gnumeric-mod/gnumeric.desktop.in	2014-01-25 10:52:57.030375336 -0600
+@@ -15,4 +15,4 @@
+ X-GNOME-Bugzilla-Version=BUGZILLAVERSION
+ X-GNOME-Bugzilla-Component=General
+ X-GNOME-DocPath=gnumeric
+-MimeType=application/x-gnumeric;application/vnd.ms-excel;application/excel;application/msexcel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-xls;application/xls;application/x-dos_ms_excel;zz-application/zz-winassoc-xls;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/tab-separated-values;text/csv;text/x-csv;text/spreadsheet;text/tab-separated-values;application/vnd.lotus-1-2-3;application/x-123;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-applix-spreadsheet;application/x-mps;application/x-oleo;application/x-planperfect;application/x-quattropro;application/x-sc;application/x-sylk;application/x-dbase;application/x-dbf;application/x-xbase;application/vnd.oasis.opendocument.spreadsheet;
++MimeType=application/x-gnumeric;application/vnd.ms-excel;application/excel;application/msexcel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-xls;application/xls;application/x-dos_ms_excel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/tab-separated-values;text/csv;text/x-csv;text/spreadsheet;text/tab-separated-values;application/vnd.lotus-1-2-3;application/x-123;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-applix-spreadsheet;application/x-mps;application/x-oleo;application/x-planperfect;application/x-quattropro;application/x-sc;application/x-sylk;application/x-dbase;application/x-dbf;application/x-xbase;application/vnd.oasis.opendocument.spreadsheet;