Accepting request 77952 from GNOME:Apps

Update to 2.4.7 (+ tweak for previous change) (forwarded request 77895 from vuntz)

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

gnucash-2.4.5.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:edc76109ca6cc31ee02734d4dd129d1177bc4b4e6de40e7de9e5752fc38faf92
-size 9264705

gnucash-2.4.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eeb3b17f9081a544f8705db735df88ab3f468642a1d01552ea4e36bcb5b0730e
+size 9297876

gnucash-guile-2.0.patch

@@ -0,0 +1,56 @@
+Index: gnucash-2.4.6/src/import-export/aqbanking/Makefile.am
+===================================================================
+--- gnucash-2.4.6.orig/src/import-export/aqbanking/Makefile.am
++++ gnucash-2.4.6/src/import-export/aqbanking/Makefile.am
+@@ -45,6 +45,7 @@ libgncmod_aqbanking_la_LIBADD = \
+   ${GNOME_LIBS} \
+   ${GLADE_LIBS} \
+   ${GLIB_LIBS} \
++  ${GUILE_LIBS} \
+   ${GWENGUI_GTK2_LIBS} \
+   ${AQBANKING_LIBS}
+ 
+@@ -64,6 +65,7 @@ AM_CFLAGS = \
+   ${GNOME_CFLAGS} \
+   ${GLADE_CFLAGS} \
+   ${GLIB_CFLAGS} \
++  ${GUILE_INCS} \
+   ${AQBANKING_CFLAGS}
+ 
+ uidir = $(GNC_UI_DIR)
+Index: gnucash-2.4.6/src/guile-mappings.h
+===================================================================
+--- gnucash-2.4.6.orig/src/guile-mappings.h
++++ gnucash-2.4.6/src/guile-mappings.h
+@@ -17,7 +17,7 @@
+  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.        *
+ \********************************************************************/
+ 
+-#include <libguile/version.h> /* for SCM_MAJOR_VERSION etc */
++#include <libguile.h> /* for SCM_MAJOR_VERSION etc */
+ 
+ /* Give Guile 1.6 and 1.8 a 2.0-like interface */
+ #if (SCM_MAJOR_VERSION == 1) && (SCM_MINOR_VERSION <= 6)
+Index: gnucash-2.4.6/src/plugins/bi_import/Makefile.am
+===================================================================
+--- gnucash-2.4.6.orig/src/plugins/bi_import/Makefile.am
++++ gnucash-2.4.6/src/plugins/bi_import/Makefile.am
+@@ -29,7 +29,8 @@ libgncmod_bi_import_la_LIBADD = \
+   ${GNOME_LIBS} \
+   ${GLADE_LIBS} \
+   ${QOF_LIBS} \
+-  ${GLIB_LIBS}
++  ${GLIB_LIBS} \
++  ${GUILE_LIBS}
+ 
+ AM_CFLAGS = \
+   -I${top_srcdir}/src \
+@@ -52,6 +53,7 @@ AM_CFLAGS = \
+   ${GNOME_CFLAGS} \
+   ${GLADE_CFLAGS} \
+   ${QOF_CFLAGS} \
+-  ${GLIB_CFLAGS}
++  ${GLIB_CFLAGS} \
++  ${GUILE_INCS}
+ 
+ INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.bi_import\"

gnucash.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Wed Aug  3 14:45:20 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 2.4.7:
+  + Various code changes.
+  + Bugs fixed:
+    - bgo#653056: Fix menu accelerators not working, crash on
+      save-while-quitting.
+    - bgo#646541: new invoice line items default to invoice open
+      date instead of current date.
+    - bgo#652257, bgo#652435, bgo#652377, bgo#632931, bgo#651889,
+      bgo#651992, bgo#612562, bgo#652193.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Tue Jun 21 09:27:18 UTC 2011 - pgajdos@novell.com
+
+- Update to version 2.4.6:
+  + Many style fixes for HTML reports.
+  + Various other code changes.
+  + Bugs fixed:
+    - bgo#648554: SQL backend doesn't correctly save taxable flag
+      on bills.
+    - bgo#647242: Fix broken averaging for quarter or half-year
+      step size
+    - bgo#650241, bgo#650757, bgo#645221, bgo#620123, bgo#650163,
+      bgo#650139, bgo#650138, bgo#649992, bgo#649608, bgo#646729,
+      bgo#647945, bgo#644897, bgo#646268, bgo#644762, bgo#647360,
+      bgo#647316, bgo#628342, bgo#629156.
+  + Updated translations.
+- Add gnucash-guile-2.0.patch: fix build with guile 2.0.
+
 -------------------------------------------------------------------
 Fri Apr 29 09:25:05 UTC 2011 - dimstar@opensuse.org
 

gnucash.spec

@@ -18,7 +18,7 @@
 
 
 Name:           gnucash
-Version:        2.4.5
+Version:        2.4.7
 Release:        1
 License:        GPLv2+
 Summary:        Personal Finance Manager
@@ -30,6 +30,8 @@ Source1:        %{name}-rpmlintrc
 Patch:          gnucash-desktop.patch
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches
 Patch3:         gnucash-cpan-warning.patch
+# PATCH-FIX-UPSTREAM gnucash-guile-2.0.patch bgo#655901 pgajdos@novell.com -- Fix build with guile 2.0
+Patch4:         gnucash-guile-2.0.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  guile-devel
@@ -100,6 +102,7 @@ balanced books.
 %patch
 # This patch must be applied:
 %patch3
+%patch4 -p1
 
 %build
 %configure\