[cvs] experimental/dmacks/finkinfo gnumeric.info,1.2,1.3

[Daniel M. <dm...@us...>]

Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17674

Modified Files:
	gnumeric.info 
Log Message:
cleanup and instrument for GNOME2.28 standards


Index: gnumeric.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnumeric.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gnumeric.info	16 Apr 2010 05:17:53 -0000	1.2
+++ gnumeric.info	16 Apr 2010 09:00:28 -0000	1.3
@@ -1,63 +1,44 @@
 Package: gnumeric
 Version: 1.10.0
-Revision: 1.1
+Revision: 1.2
 Source: mirror:gnome:sources/%n/1.10/%n-%v.tar.bz2
 Source-MD5: 45ca0c86d41288c1e70b25b74f5cd548
 #PatchFile: %n.patch
 #PatchFile-MD5: 27cb9aea43790193188e1541f2843cd3
 BuildDepends: <<
- atk1 (>= 1.20.0-1),
- audiofile,
- avahi-dev,
- bzip2-dev,
- cairo (>= 1.6-1),
+ atk1 (>= 1.28.0-1),
+ cairo (>= 1.8.8-3),
  dbus-dev (>= 1.0-1),
- esound (>= 0.2.38-1),
- expat1,
+ dpkg-base-files,
  fink (>= 0.24.12),
- fontconfig2-dev (>= 2.4.1-1),
- freetype219 (>= 2.3.5-1),
- gconf2-dev (>= 2.20.0-1),
- glib2-dev (>= 2.14.0-1),
+ fink-package-precedence,
+ fontconfig2-dev (>= 2.8.0-4),
+ freetype219 (>= 2.3.12-1),
+ gconf2-dev (>= 2.28.0-1),
+ glib2-dev (>= 2.22.0-1),
  glitz,
- gnome-keyring-dev (>= 0.8.1-1),
- gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- gtk+2-dev (>= 2.14.4-1),
- gtksourceview-dev (>= 1.8.5-1),
+ gtk+2-dev (>= 2.18.0-1),
  intltool40,
- libart2 (>= 2.3.16-1),
- libavahi-glib1-dev,
- libbonobo2-dev (>= 2.20.0-1),
- libbonoboui2-dev (>= 2.20.0-1),
- libgcrypt,
- libgda4-dev (>= 3.1.2-4),
  libgettext8-dev,
- libglade2 (>= 2.6.2-1),   
+ libglade2 (>= 2.6.4-7),   
  libgoffice-0.8,
- libgnome2-dev (>= 2.20.0-1),
- libgnomecanvas2-dev (>= 2.20.0-1),
- libgnomedb4-dev (>= 3.1.2-2),
- libgnomeui2-dev (>= 2.20.0-1),
- libgpg-error,
- libgsf1.114-dev,
- libgsf1.114-gnome-dev,
+ libgsf1.114-dev (>= 1.14.18-1),
  libiconv-dev,
- libjpeg,
- libpng3,
  libxml2 (>= 2.6.30-1),
- orbit2-dev (>= 2.14.9-1),
- pango1-xft2-ft219-dev (>= 1.18.4-4),
+ orbit2-dev (>= 2.14.17-2),
+ pango1-xft2-ft219-dev (>= 1.24.5-4),
  pcre,
- pixman (>= 0.10.0-1),
- pkgconfig (>= 0.21-1),
- popt,
- pth2-dev,
- pygobject2-py26-dev,
- sqlite3-dev,
- x11-dev,
- xft2-dev
+ pixman (>= 0.16.0-1),
+ pkgconfig (>= 0.23),
+ pygobject2-py26-dev (>= 2.20.0-1),
+ x11-dev
+<<
+Depends: <<
+ %N-shlibs (= %v-%r),
+ desktop-file-utils,
+ gconf2 (>= 2.28.0-1),
+ rarian-compat
 <<
-Depends: %N-shlibs (= %v-%r), desktop-file-utils, rarian-compat, rarian-compat
 PatchScript: <<
  %{default_script}
  perl -pi.bak -e 's/-scrollkeeper-update.*$/-echo "no scrollkeeper-update"/g' omf.make doc/C/Makefile.in
@@ -65,23 +46,29 @@
  perl -pi -e 's|GTK_MESSAGE_ERROR,|GTK_MESSAGE_ERROR, \"%%s\",|; s|, 0,|, 0, \"%%s\",|' src/dialogs/dialog-data-table.c
  perl -pi -e 's|GTK_MESSAGE_ERROR,|GTK_MESSAGE_ERROR, \"%%s\",|' src/dialogs/dialog-so-list.c
  perl -pi -e 's|_\(\"The file saver|\"%%s\", _\(\"The file saver|; s|\), 0,|\), 0, \"%%s\",|; s|_\(\"An output file|\"%%s\", _\(\"An output file|' src/ssconvert.c
+
+	# fink's current libgda is older than needed; make sure we
+	# don't suddenly start finding it when it gets updated
+	perl -pi -e 's/(libgda-4.0 >= 4.1.1/\1 99999.FORCE.NONDETECT/' configure
 <<
 ConfigureParams: <<
   --disable-schemas-install \
   --mandir='${prefix}/share/man' \
   --libexecdir='${prefix}/lib' \
-  --disable-dependency-tracking \
-  PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" \
-  FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config \
+  --enable-dependency-tracking --disable-silent-rules \
+  PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" \
   PY_LIB_DIR="%p/lib/python2.6/config"
 <<
+# perlversion/interp-path chaos?
 CompileScript: <<
 PYTHON=%p/bin/python2.6 ./configure %c
 make
+fink-package-precedence --prohibit-bdep %n-dev .
 <<
-InfoTest: <<
- TestScript: make -k check || :
-<<
+#self-test hangs due to dbus/orbit/gconf mess under nonstandard user
+#InfoTest: <<
+# TestScript: make -k check || :
+#<<
 InstallScript: <<
  make install DESTDIR=%d
  mkdir -p %i/share/doc ; ln -s %N-shlibs %i/share/doc/%n
@@ -91,22 +78,18 @@
 SplitOff: <<
  Package: %N-shlibs
  Depends: <<
-  gconf2 (>= 2.20.0-1),
-  glib2-shlibs (>= 2.14.0-1),
-  gtk+2-shlibs (>= 2.14.4-1),
-  gtksourceview-shlibs (>= 1.8.5-1),
-  libbonobo2-shlibs (>= 2.20.0-1),
-  libbonoboui2-shlibs (>= 2.20.0-1),
-  libgda4-shlibs (>= 3.1.2-4),
+  atk1-shlibs (>= 1.28.0-1),
+  cairo-shlibs (>= 1.8.8-3),
+  fontconfig2-shlibs (>= 2.8.0-4),
+  freetype219-shlibs (>= 2.3.12-1),
+  glib2-shlibs (>= 2.22.0-1),
+  gtk+2-shlibs (>= 2.18.0-1),
   libgettext8-shlibs,
-  libglade2-shlibs (>= 2.6.2-1),
-  libgnome2-shlibs (>= 2.20.0-1),
-  libgnomedb4-shlibs (>= 3.1.2-2),
-  libgnomeui2-shlibs (>= 2.20.0-1),
+  libglade2-shlibs (>= 2.6.4-7),
   libgoffice-0.8-shlibs (>= 0.6.1-1),
-  libgsf1.114-gnome-shlibs,
-  libgsf1.114-shlibs,
+  libgsf1.114-shlibs (>= 1.14.18-1),
   libxml2-shlibs (>= 2.6.30-1),
+  pango1-xft2-ft219-shlibs (>= 1.24.5-4),
   pygobject2-py26
  <<
  Files: share/pixmaps share/locale lib/gnumeric lib/libspreadsheet-*.dylib