Commit 55374f2c authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

bump version of libole2 ditto. ditto.

2001-05-22  Jody Goldberg <jgoldberg@home.com>

	* gnumeric.spec.in : bump version of libole2
	* README : ditto.
	* configure.in : ditto.

2001-05-21  Jody Goldberg <jgoldberg@home.com>

	* Makefile.am : remove gnorba and modernize a bit.
parent b9071979
SUBDIRS = . intl po macros idl plugins src doc icons templates
SUBDIRS = . intl po macros idl src plugins doc icons templates
change_logs = ChangeLog \
OChangeLog-1999-07-09 OChangeLog-2000-02-23 OChangeLog-2000-10-10
......@@ -8,6 +8,40 @@ confexec_DATA = gnumericConf.sh
CLEANFILES=gnumericConf.sh
appicondir = $(datadir)/pixmaps
appicon_DATA = gnome-gnumeric.png \
gnome-application-x-gnumeric.png \
gnome-application-x-xls.png
Applicationsdir = $(datadir)/gnome/apps/Applications
Applications_DATA = gnumeric.desktop
gnewdir = $(datadir)/mc/templates
gnew_DATA = gnumeric.desktop
Mimedir = $(datadir)/mime-info
Mime_DATA = gnumeric.keys gnumeric.mime
@XML_I18N_MERGE_OAF_RULE@
oafdir = $(datadir)/oaf
oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
oaf_in_files = GNOME_Gnumeric.oaf.in
EXTRA_DIST = \
gnumeric.desktop.in gnumeric.spec.in gnumericConf.sh.in \
gnumeric.keys.in gnumeric.mime $(appicon_DATA) \
README HACKING NEWS BUGS MAINTAINERS AUTHORS $(change_logs) \
xml-i18n-extract.in \
xml-i18n-merge.in \
xml-i18n-update.in \
$(oaf_in_files)
if BONOBO
gnumeric_version="$(VERSION)-bonobo"
else
gnumeric_version="$(VERSION)"
endif
## Cloned from gnome-print
##
## We create printConf.sh here and not from configure because we want
......@@ -28,35 +62,6 @@ gnumericConf.sh: gnumericConf.sh.in Makefile
< $(srcdir)/gnumericConf.sh.in > gnumericConf.tmp \
&& mv gnumericConf.tmp gnumericConf.sh
EXTRA_DIST = \
gnumeric.desktop.in gnumeric.spec.in gnumericConf.sh.in \
gnumeric.keys.in gnumeric.mime $(appicon_DATA) \
gnumeric.gnorba GNOME_Gnumeric.oafinfo $(change_logs) \
README HACKING NEWS BUGS MAINTAINERS AUTHORS \
xml-i18n-extract.in \
xml-i18n-merge.in \
xml-i18n-update.in
appicondir = $(datadir)/pixmaps
appicon_DATA = gnome-gnumeric.png \
gnome-application-x-gnumeric.png \
gnome-application-x-xls.png
Applicationsdir = $(datadir)/gnome/apps/Applications
Applications_DATA = gnumeric.desktop
Mimedir = $(datadir)/mime-info
Mime_DATA = gnumeric.keys gnumeric.mime
gnewdir = $(datadir)/mc/templates
gnew_DATA = gnumeric.desktop
gnorbadir = $(sysconfdir)/CORBA/servers
gnorba_DATA = gnumeric.gnorba
oafdir = $(datadir)/oaf
oaf_DATA = GNOME_Gnumeric.oafinfo
gnumeric.keys: gnumeric.keys.in Makefile
sed -e 's^\@icondir\@^$(appicondir)^g' < $(srcdir)/gnumeric.keys.in > gnumeric.keys.tmp \
&& mv gnumeric.keys.tmp gnumeric.keys
......@@ -65,10 +70,3 @@ dist-hook: gnumeric.spec
mkdir $(distdir)/samples
cp $(srcdir)/samples/*gnumeric $(distdir)/samples
cp gnumeric.spec $(distdir)
if BONOBO
gnumeric_version="$(VERSION)-bonobo"
else
gnumeric_version="$(VERSION)"
endif
......@@ -30,7 +30,7 @@ You need:
gnome-xml >= 1.8.12 (gnome-xml 2.x not supported yet)
NOTE : gnome-xml is also known as libxml
libole2 >= 0.2.2
libole2 >= 0.2.3
NOTE : libole2 is also known as libgnomeole2
Optionally:
......
......@@ -246,13 +246,13 @@ else
fi
dnl Check for libole2
AC_MSG_CHECKING(for libole2 >= 0.2.2 )
AC_MSG_CHECKING(for libole2 >= 0.2.3 )
libole2_ok=no
if gnome-config --libs libole2 > /dev/null 2>&1; then
verstxt=`gnome-config --modversion libole2`
vers=`echo "$verstxt" | sed -e "s/^libole2-//" | \
awk -F. '{ printf "%d", $1 * 10000 + $2 * 100 + $3; }'`
if test "$vers" -ge 202; then
if test "$vers" -ge 203; then
AC_MSG_RESULT($marker_ok found $verstxt)
libole2_ok=yes
else
......
......@@ -19,7 +19,7 @@ Requires: gnome-libs >= 1.0.57
Requires: gnome-print >= 0.25
Requires: libglade >= 0.16
Requires: libxml >= 1.8.12
Requires: libole2 >= 0.2.2
Requires: libole2 >= 0.2.3
Requires: gal >= 0.8
# The help menu commands require whatever package contains the gnome-help
# program.
......
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