Hello community, here is the log from the commit of package gnucash checked in at Tue Mar 27 01:30:55 CEST 2007. -------- --- GNOME/gnucash/gnucash.changes 2007-03-02 16:14:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/gnucash/gnucash.changes 2007-03-26 22:14:16.203297000 +0200 @@ -1,0 +2,6 @@ +Mon Mar 26 22:13:49 CEST 2007 - maw@suse.de + +- Add gtkhtml-req.patch, allowing gnucash to be built against + newer versions of gtkhtml2. + +------------------------------------------------------------------- Old: ---- minmem New: ---- gtkhtml-req.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnucash.spec ++++++ --- /var/tmp/diff_new_pack.c15279/_old 2007-03-27 01:30:44.000000000 +0200 +++ /var/tmp/diff_new_pack.c15279/_new 2007-03-27 01:30:44.000000000 +0200 @@ -12,7 +12,7 @@ Name: gnucash Version: 2.0.5 -Release: 2 +Release: 6 URL: http://www.gnucash.org/ Group: Productivity/Office/Finance License: GNU General Public License (GPL) @@ -20,6 +20,7 @@ Source: %{name}-%{version}.tar.bz2 Patch: fix-desktop-file.diff Patch1: gnucash-no-gtk_html_print.patch +Patch2: gtkhtml-req.patch Requires: guile slib BuildRequires: doxygen g-wrap-devel gconf2-devel glib2-devel goffice-devel graphviz gtk2-devel gtkhtml2-devel guile-devel indent intltool ktoblzcheck-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libgsf-devel libofx-devel libxml2-devel perl-XML-Parser popt-devel slib update-desktop-files # Optional features: @@ -412,6 +413,7 @@ %patch %endif %patch1 +%patch2 -p1 sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in %build @@ -495,6 +497,9 @@ %{_includedir}/gnucash %changelog +* Mon Mar 26 2007 - maw@suse.de +- Add gtkhtml-req.patch, allowing gnucash to be built against + newer versions of gtkhtml2. * Fri Mar 02 2007 - sbrabec@suse.cz - Fixed autoreconf. - Fixed missing symbol in gtkhtml2. ++++++ gtkhtml-req.patch ++++++ Index: gnucash-2.0.5/configure.in =================================================================== --- gnucash-2.0.5.orig/configure.in +++ gnucash-2.0.5/configure.in @@ -1123,19 +1123,23 @@ then # check for gtkhtml 3.x versions. gtkhtml=0 - PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 , [gtkhtml=1] , [gtkhtml=0]) + PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 , [gtkhtml=1], [gtkhtml=0]) if test $gtkhtml = 0 then - PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.6 , [gtkhtml=1] , [gtkhtml=0]) - if test $gtkhtml = 0 - then - PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.2 , [gtkhtml=1] , [gtkhtml=0]) - if test $gtkhtml = 0 - then - PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1], - AC_MSG_ERROR([Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, or 3.8)])) - fi - fi + PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8 , [gtkhtml=1] , [gtkhtml=0]) + if test $gtkhtml = 0 + then + PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.6 , [gtkhtml=1] , [gtkhtml=0]) + if test $gtkhtml = 0 + then + PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.2 , [gtkhtml=1] , [gtkhtml=0]) + if test $gtkhtml = 0 + then + PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.1 , [gtkhtml=1], + AC_MSG_ERROR([Could not find a working gtkhtml version (need 3.1, 3.2, 3.6, 3.8, or 3.14)])) + fi + fi + fi fi AS_SCRUB_INCLUDE(GTKHTML_CFLAGS) dnl if Mac OSX, also scrub /sw/include ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org