[gnucash/f14/master] Update to 2.3.15. Add upstream patch for config migration. (#571621)

[Bill Nottingham]

commit 749873268749909d9b22877e7775936855766c09
Author: Bill Nottingham <notting at redhat.com>
Date:   Mon Aug 23 12:15:55 2010 -0400

    Update to 2.3.15. Add upstream patch for config migration. (#571621)

 aqbanking.patch       |   52 +++++++++++++++++++++++++++++++++++++++++++++++++
 gnucash-latvian.patch |   22 --------------------
 gnucash.spec          |   12 +++++++---
 3 files changed, 60 insertions(+), 26 deletions(-)
---
diff --git a/aqbanking.patch b/aqbanking.patch
new file mode 100644
index 0000000..9f3921b
--- /dev/null
+++ b/aqbanking.patch
@@ -0,0 +1,52 @@
+Index: /gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c
+===================================================================
+--- /gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c (revision 19301)
++++ /gnucash/trunk/src/import-export/aqbanking/gnc-ab-utils.c (revision 19443)
+@@ -135,4 +135,47 @@
+         g_return_val_if_fail(api, NULL);
+ 
++#ifdef AQBANKING_VERSION_4_PLUS
++        /* Check for config migration */
++        if (AB_Banking_HasConf4(api
++# ifndef AQBANKING_VERSION_5_PLUS
++                                , 0
++# endif
++                ) != 0)
++        {
++            if (AB_Banking_HasConf3(api
++# ifndef AQBANKING_VERSION_5_PLUS
++                                    , 0
++# endif
++                    ) == 0)
++            {
++                g_message("gnc_AB_BANKING_new: importing aqbanking3 configuration\n");
++                if (AB_Banking_ImportConf3(api
++# ifndef AQBANKING_VERSION_5_PLUS
++                                           , 0
++# endif
++                        ) < 0)
++                {
++                    g_message("gnc_AB_BANKING_new: unable to import aqbanking3 configuration\n");
++                }
++            }
++            else if (AB_Banking_HasConf2(api
++# ifndef AQBANKING_VERSION_5_PLUS
++                                         , 0
++# endif
++                         ) == 0)
++            {
++                g_message("gnc_AB_BANKING_new: importing aqbanking2 configuration\n");
++                if (AB_Banking_ImportConf2(api
++# ifndef AQBANKING_VERSION_5_PLUS
++                                           , 0
++# endif
++                        ) < 0)
++                {
++                    g_message("gnc_AB_BANKING_new: unable to import aqbanking2 configuration\n");
++                }
++            }
++        } 
++#endif /* AQBANKING_VERSION_4_PLUS */        
++        
+         /* Init the API */
+         g_return_val_if_fail(AB_Banking_Init(api) == 0, NULL);
diff --git a/gnucash.spec b/gnucash.spec
index e3f9142..4894dc1 100644
--- a/gnucash.spec
+++ b/gnucash.spec
@@ -2,9 +2,9 @@
 
 Name: gnucash
 Summary: Finance management application
-Version: 2.3.13
+Version: 2.3.15
 URL: http://gnucash.org/
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/unstable/2.3.x/gnucash-%{version}.tar.bz2
@@ -17,7 +17,7 @@ BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 BuildRequires: python-devel, libdbi-devel
 Patch0: gnucash-quiet.patch
-Patch1: gnucash-latvian.patch
+Patch2: aqbanking.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -39,7 +39,7 @@ balanced books.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+%patch2 -p3
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -129,6 +129,10 @@ fi
 %doc doc/README.german doc/README.francais doc/README.OFX doc/README.HBCI
 
 %changelog
+* Mon Aug 23 2010 Bill Nottingham <notting at redhat.com> - 2.3.15-1
+- update to 2.3.15
+- include upstream patch for config migration (#571621)
+
 * Tue Jul  6 2010 Bill Nottingham <notting at redhat.com> - 2.3.13-2
 - rebuild against newer webkitgtk