Commit adddb75d authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

bump libxml1 req to 1.8.14 to fix i18n xml import broken with the switch

2001-06-28  Jody Goldberg <jgoldberg@home.com>

	* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
	  broken with the switch to the progress monitor.
	* gnumeric.spec.in : ditto.

	* src/Makefile.am : Restore files that were not distributed due the
	  differences in bonobo build.
parent e11066b6
......@@ -7,6 +7,7 @@ release, and longer term bugs.
Release Critical
----------------
- enable multibyte translations
Pending Patches
---------------
......@@ -51,7 +52,7 @@ Names :
- scrollbar sizes are based on rows/cols rather than visible pixels
- scrollbar size includes hidden rows/cols
- calculated cells do not respan.
- calculated cells do not span.
- Why does the number matching bother comparing against formats that are
covered by 'General' ?
......
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
broken with the switch to the progress monitor.
* gnumeric.spec.in : ditto.
* src/Makefile.am : Restore files that were not distributed due the
differences in bonobo build.
2001-06-27 John Gotts <jgotts@linuxsavvy.com>
* gnumeric.spec.in : resynch with 0.66.
......
Gnumeric 0.67
Jody :
* Restore missing files.
John Gotts :
* Update spec file.
Zbigniew:
* Fix libml1 bug exposed by progress monitor.
--------------------------------------------------------------------------
Gnumeric 0.66
Almer:
......
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
broken with the switch to the progress monitor.
* gnumeric.spec.in : ditto.
* src/Makefile.am : Restore files that were not distributed due the
differences in bonobo build.
2001-06-27 John Gotts <jgotts@linuxsavvy.com>
* gnumeric.spec.in : resynch with 0.66.
......
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
broken with the switch to the progress monitor.
* gnumeric.spec.in : ditto.
* src/Makefile.am : Restore files that were not distributed due the
differences in bonobo build.
2001-06-27 John Gotts <jgotts@linuxsavvy.com>
* gnumeric.spec.in : resynch with 0.66.
......
2001-06-28 Jody Goldberg <jgoldberg@home.com>
* configure.in : bump libxml1 req to 1.8.14 to fix i18n xml import
broken with the switch to the progress monitor.
* gnumeric.spec.in : ditto.
* src/Makefile.am : Restore files that were not distributed due the
differences in bonobo build.
2001-06-27 John Gotts <jgotts@linuxsavvy.com>
* gnumeric.spec.in : resynch with 0.66.
......
......@@ -119,33 +119,25 @@ AC_SUBST(GNOMEGNORBA_LIBS)
dnl ******************************
dnl gnome-xml checking
dnl ******************************
AC_MSG_CHECKING(for libxml (aka gnome-xml) libraries 1.8.12 <= version < 2.0.0 )
xml_ok=no
AC_MSG_CHECKING(for libxml (aka gnome-xml) libraries 1.8.14 <= version < 2.0.0 )
if xml-config --libs > /dev/null 2>&1; then
verstxt=`xml-config --version`
vers=`echo "$verstxt" | sed -e "s/libxml //" | \
awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test "$vers" -ge 1008012; then
if test "$vers" -ge 1008014; then
if test "$vers" -lt 2000000; then
AC_MSG_RESULT($marker_ok found $verstxt)
xml_ok=yes
else
AC_MSG_RESULT($marker_fail found unsupported $verstxt)
AC_MSG_ERROR(This version of Gnumeric does not support libxml (aka gnome-xml) 2.x.x yet.)
fi
else
AC_MSG_RESULT($marker_fail found only $verstxt)
AC_MSG_ERROR(You need at least libxml (aka gnome-xml) 1.8.14)
fi
else
AC_MSG_RESULT($marker_fail not found)
fi
if test "$xml_ok" = no; then
AC_MSG_ERROR(You need at least libxml (aka gnome-xml) 1.8.12 for this version of Gnumeric.
libxml version 2.x.x is not compatible with libxml version 1.x.x.
Version 2.x.x is not yet supported.)
fi
unset xml_ok
dnl **************************************************
dnl * Check for Perl
......@@ -597,13 +589,14 @@ AM_CONDITIONAL(WITH_PLAN_PERFECT, false)
AC_OUTPUT([
gnumeric.spec
Makefile
libgnumeric/Makefile
libgnumeric/portability.h
icons/Makefile
idl/Makefile
src/Makefile
src/dialogs/Makefile
src/widgets/Makefile
src/functions/Makefile
src/portability.h
doc/Makefile
doc/C/Makefile
plugins/Makefile
......
......@@ -18,7 +18,7 @@ Requires: gtk+ >= 1.2.7
Requires: gnome-libs >= 1.0.57
Requires: gnome-print >= 0.25
Requires: libglade >= 0.16
Requires: libxml >= 1.8.12
Requires: libxml >= 1.8.14
Requires: libole2 >= 0.2.3
Requires: gal >= 0.8
# The help menu commands require whatever package contains the gnome-help
......@@ -125,6 +125,9 @@ fi
##%{prefix}/lib/gnumeric/%{version}-bonobo/plugins/*/*.la
%changelog
* Thu Jun 28 2001 Jody Goldberg <jgoldberg@home.com>
- bump libxml1 req.
* Wed Jun 27 2001 John Gotts <jgotts@linuxsavvy.com>
- Added the python stuff back; it reappeared in 0.66.
- We're now Bonobo by default!
......
......@@ -263,7 +263,6 @@ gnumeric_LDADD = \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
$(PSPELL_LIBS) \
$(INTLLIBS)
else
gnumeric_SOURCES = \
......@@ -285,6 +284,11 @@ gnumeric_libs = \
widgets/libwidgets.a \
functions/libfunctions.a
# include conditional files to ensure everything gets distributed no matter
# what the build
EXTRA_DIST = portability.h.in GNOME_Gnumeric.xml \
normal-args.c corba-args.c \
$(GNUMERIC_BONOBO_SOURCES)
dist-hook:
-mkdir $(distdir)/pixmaps
cp $(srcdir)/pixmaps/*.xpm $(distdir)/pixmaps
......@@ -297,8 +301,6 @@ dist-hook:
# $(GNOME_XML_LIB) \
# $(INTLLIBS)
EXTRA_DIST = portability.h.in GNOME_Gnumeric.xml
# Bonobo requires things to be in a subdir of this form
uidir=$(gnumeric_datadir)/gnome/ui
ui_DATA = GNOME_Gnumeric.xml
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment