rpms/gnucash/devel gnucash-2.0.5-libofx.patch, NONE, 1.1 gnucash.spec, 1.68, 1.69

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/gnucash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12011

Modified Files:
	gnucash.spec 
Added Files:
	gnucash-2.0.5-libofx.patch 
Log Message:
fix libofx patch


gnucash-2.0.5-libofx.patch:

--- NEW FILE gnucash-2.0.5-libofx.patch ---
--- gnucash-2.0.5/configure.moo	2007-02-24 01:41:41.000000000 -0500
+++ gnucash-2.0.5/configure	2007-02-24 01:41:41.000000000 -0500
@@ -27485,44 +27485,6 @@
 	LIBOFX_CFLAGS="-I${OFXPREFIX}/include"
     fi
 
-    ### Check libofx version
-    # Obtain version string
-    { echo "$as_me:$LINENO: checking for libofx version >= 0.7.0" >&5
-echo $ECHO_N "checking for libofx version >= 0.7.0... $ECHO_C" >&6; }
-    if test x${OFXPREFIX} = x ; then
-	ofx_version_output=`ofxdump --version`
-    else
-	ofx_version_output=`${OFXPREFIX}/bin/ofxdump --version`
-    fi
-    # Extract version number; output format changed from 0.6.x to 0.7.x
-    LIBOFX_VERSION=`echo ${ofx_version_output} | sed 's/\([^0-9]*\)\([0-9]*\.\)/\2/' `
-    LIBOFX_VERSION_MAJOR=`echo ${LIBOFX_VERSION} | cut -d. -f1`
-    LIBOFX_VERSION_MINOR=`echo ${LIBOFX_VERSION} | cut -d. -f2`
-    # Make sure the numbers are not empty
-    if test x${LIBOFX_VERSION_MAJOR} = x ; then
-	LIBOFX_VERSION_MAJOR=0
-    fi
-    if test x${LIBOFX_VERSION_MINOR} = x ; then
-	LIBOFX_VERSION_MINOR=0
-    fi
-    # Now check for >= 0.7.x or >= 1.x.x
-    if test "${LIBOFX_VERSION_MAJOR}" -ge 1 -o \
-	     "${LIBOFX_VERSION_MINOR}" -ge 7; then
-	# This is libofx >= 0.7.x
-	{ echo "$as_me:$LINENO: result: found ${LIBOFX_VERSION}" >&5
-echo "${ECHO_T}found ${LIBOFX_VERSION}" >&6; }
-    else
-        if test x${want_ofx} = xyes ; then
-	    { { echo "$as_me:$LINENO: error: found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&5
-echo "$as_me: error: found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&2;}
-   { (exit 1); exit 1; }; }
-        else
-	    { echo "$as_me:$LINENO: result: found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&5
-echo "${ECHO_T}found ${LIBOFX_VERSION}; Libofx 0.7.0 or newer needed for ofx support" >&6; }
-            want_ofx=no
-        fi
-    fi
-
     if test "x${want_ofx}" != xno ; then
         # Version number verified. Now check header files.
         { echo "$as_me:$LINENO: checking for libofx/libofx.h" >&5


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- gnucash.spec	14 Mar 2007 02:25:22 -0000	1.68
+++ gnucash.spec	14 Mar 2007 02:38:29 -0000	1.69
@@ -4,11 +4,11 @@
 Summary: GnuCash is an application to keep track of your finances
 Version: 2.0.5
 URL: http://gnucash.org/
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
-Patch1: foo
+Patch1: gnucash-2.0.5-libofx.patch
 Patch4: gnucash-1.8.6-64bit-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: g-wrap-devel >= 1.3.2
@@ -39,8 +39,7 @@
 
 %prep
 %setup -q
-
-%patch1 -p1 -b .foo
+%patch1 -p1 -b .libofx
 %patch4 -p1 -b .64bit
 
 %build
@@ -124,8 +123,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
-* Tue Mar 13 2007 Bill Nottingham <notting at redhat.com> - 2.0.5-2
+* Tue Mar 13 2007 Bill Nottingham <notting at redhat.com> - 2.0.5-3
 - require gtkhtml38 include file to pull in the proper gtkhtml version
+- fix build when libofx and ofx tools are separate
 
 * Mon Feb 19 2007 Bill Nottingham <notting at redhat.com> - 2.0.5-1
 - update to 2.0.5