pool/gnucash
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=6

Browse Source
This commit is contained in:
OBS User unknown 2007-03-26 23:30:55 +00:00 committed by Git OBS Bridge
parent 6360824f1f
commit 16581ca05f
3 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnucash.changes
View File

@ -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 Fri Mar 2 16:14:36 CET 2007 - sbrabec@suse.cz

7
gnucash.spec
View File

@ -12,7 +12,7 @@
Name: gnucash Name: gnucash
Version: 2.0.5 Version: 2.0.5
Release: 2 Release: 6
URL: http://www.gnucash.org/ URL: http://www.gnucash.org/
Group: Productivity/Office/Finance Group: Productivity/Office/Finance
License: GNU General Public License (GPL) License: GNU General Public License (GPL)
@ -20,6 +20,7 @@ Summary: Personal Finance Manager
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Patch: fix-desktop-file.diff Patch: fix-desktop-file.diff
Patch1: gnucash-no-gtk_html_print.patch Patch1: gnucash-no-gtk_html_print.patch
Patch2: gtkhtml-req.patch
Requires: guile slib 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 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: # Optional features:
@ -412,6 +413,7 @@ Authors:
%patch %patch
%endif %endif
%patch1 %patch1
%patch2 -p1
sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in
%build %build
@ -495,6 +497,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/gnucash %{_includedir}/gnucash
%changelog %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 * Fri Mar 02 2007 - sbrabec@suse.cz
- Fixed autoreconf. - Fixed autoreconf.
- Fixed missing symbol in gtkhtml2. - Fixed missing symbol in gtkhtml2.

39
gtkhtml-req.patch Normal file
View File

@ -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