From 16581ca05f29e859f078b1f0211937cb39c283c294129fe762a0c5a780bc1131 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 26 Mar 2007 23:30:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=6 --- gnucash.changes | 6 ++++++ gnucash.spec | 7 ++++++- gtkhtml-req.patch | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gtkhtml-req.patch diff --git a/gnucash.changes b/gnucash.changes index debf4b4..5fb5d57 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Fri Mar 2 16:14:36 CET 2007 - sbrabec@suse.cz diff --git a/gnucash.spec b/gnucash.spec index b75fa22..e4713c8 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -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 @@ Summary: Personal Finance Manager 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 @@ Authors: %patch %endif %patch1 +%patch2 -p1 sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in %build @@ -495,6 +497,9 @@ rm -rf $RPM_BUILD_ROOT %{_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. diff --git a/gtkhtml-req.patch b/gtkhtml-req.patch new file mode 100644 index 0000000..c0f6eff --- /dev/null +++ b/gtkhtml-req.patch @@ -0,0 +1,39 @@ +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