rpms/libofx/F-9 libofx-account-type.patch, 1.1, 1.2 libofx-version.patch, 1.1, 1.2 libofx.spec, 1.34, 1.35

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/libofx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2980

Modified Files:
	libofx-account-type.patch libofx-version.patch libofx.spec 
Log Message:
Fix patches (#415961)


libofx-account-type.patch:

Index: libofx-account-type.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-account-type.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofx-account-type.patch	14 Feb 2008 18:48:22 -0000	1.1
+++ libofx-account-type.patch	10 Sep 2008 17:55:24 -0000	1.2
@@ -1,10 +1,11 @@
-diff -up libofx-0.8.3/lib/ofx_request_statement.cpp.foo libofx-0.8.3/lib/ofx_request_statement.cpp
---- libofx-0.8.3/lib/ofx_request_statement.cpp.foo	2008-02-14 13:40:01.000000000 -0500
-+++ libofx-0.8.3/lib/ofx_request_statement.cpp	2008-02-14 13:41:10.000000000 -0500
-@@ -63,7 +63,16 @@ OfxAggregate OfxStatementRequest::BankSt
+diff -up libofx-0.8.3/lib/ofx_request_statement.cpp.acc libofx-0.8.3/lib/ofx_request_statement.cpp
+--- libofx-0.8.3/lib/ofx_request_statement.cpp.acc	2007-01-08 22:35:30.000000000 -0500
++++ libofx-0.8.3/lib/ofx_request_statement.cpp	2008-09-10 13:52:19.000000000 -0400
+@@ -61,8 +62,16 @@ OfxAggregate OfxStatementRequest::BankSt
+   OfxAggregate bankacctfromTag("BANKACCTFROM");
    bankacctfromTag.Add( "BANKID", m_account.bankid );
    bankacctfromTag.Add( "ACCTID", m_account.accountid );
-   bankacctfromTag.Add( "ACCTTYPE", "CHECKING" );
+-  bankacctfromTag.Add( "ACCTTYPE", "CHECKING" );
 -  // FIXME "CHECKING" should not be hard-coded
 +  if ( m_account.type == OFX_CHECKING_ACCOUNT || m_account.type == OFX_BANK_ACCOUNT )
 +    bankacctfromTag.Add( "ACCTTYPE", "CHECKING" );
@@ -19,20 +20,3 @@
  
    OfxAggregate inctranTag("INCTRAN");
    inctranTag.Add( "DTSTART", time_t_to_ofxdate( m_date_from ) );
-diff -up libofx-0.8.3/inc/libofx.h.foo libofx-0.8.3/inc/libofx.h
---- libofx-0.8.3/inc/libofx.h.foo	2008-02-14 13:36:38.000000000 -0500
-+++ libofx-0.8.3/inc/libofx.h	2008-02-14 13:39:12.000000000 -0500
-@@ -705,7 +705,12 @@ typedef enum{
-   OFX_BANK_ACCOUNT,
-   OFX_INVEST_ACCOUNT,
-   OFX_CREDITCARD_ACCOUNT,
--  OFX_INVALID_ACCOUNT
-+  OFX_INVALID_ACCOUNT,
-+  OFX_CHECKING_ACCOUNT,
-+  OFX_SAVINGS_ACCOUNT,
-+  OFX_MONEYMRKT_ACCOUNT,
-+  OFX_CREDITLINE_ACCOUNT,
-+  OFX_CMA_ACCOUNT
- } AccountType;
- 
-  /**

libofx-version.patch:

Index: libofx-version.patch
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofx-version.patch	21 Aug 2008 04:29:05 -0000	1.1
+++ libofx-version.patch	10 Sep 2008 17:55:24 -0000	1.2
@@ -1,5 +1,5 @@
---- ofx_request.cpp	2005/07/12 04:32:04	1.2
-+++ ofx_request.cpp	2007/10/26 18:46:42	1.3
+--- libofx-0.8.3/lib/ofx_request.cpp	2005/07/12 04:32:04	1.2
++++ libofx-0.8.3/lib/ofx_request.cpp	2007/10/26 18:46:42	1.3
 @@ -52,7 +52,7 @@
  {
    return string("OFXHEADER:100\r\n"


Index: libofx.spec
===================================================================
RCS file: /cvs/extras/rpms/libofx/F-9/libofx.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- libofx.spec	21 Aug 2008 04:29:05 -0000	1.34
+++ libofx.spec	10 Sep 2008 17:55:24 -0000	1.35
@@ -3,12 +3,12 @@
 Summary: A library for supporting Open Financial Exchange (OFX)
 Name: libofx
 Version: 0.8.3
-Release: 6
+Release: 7
 Source: http://downloads.sourceforge.net/libofx/%{name}-%{version}.tar.gz
 URL: http://libofx.sourceforge.net/
 Group:	System Environment/Libraries
 License: GPLv2+
-Patch: libofx-0.8.3-xml++.patch
+Patch1: libofx-0.8.3-xml++.patch
 Patch2: libofx-assorted-c++-fu.patch
 Patch3: libofx-account-type.patch
 Patch4: libofx-version.patch
@@ -51,7 +51,7 @@
 %prep
 %setup -q
 %if %{with_xml}
-%patch -p1
+%patch1 -p1
 autoconf
 %endif
 %patch2 -p1
@@ -99,6 +99,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Wed Sep 10 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-7
+- fix account types patch (#415961, revisited)
+
 * Thu Aug 21 2008 Bill Nottingham <notting at redhat.com> - 0.8.3-6
 - Bump app versions so banks don't reject it (#459367)