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

gnucash-2.2.8.tar.bz2

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

gnucash-2.2.9.tar.bz2

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

gnucash-desktop.patch

@@ -12,7 +12,7 @@
  Icon=gnucash-icon
 --- src/gnome/gnucash.desktop.in.in
 +++ src/gnome/gnucash.desktop.in.in
-@@ -2,10 +2,11 @@
+@@ -2,7 +2,8 @@
  Type=Application
  MimeType=application/x-gnucash;
  Version=0.9.4
@@ -22,6 +22,3 @@
  _Comment=Manage your finances, accounts, and investments
  Exec=gnucash %f
  Icon=gnucash-icon
- StartupNotify=true
- Terminal=false
-

gnucash-latest-goffice.patch

@@ -0,0 +1,133 @@
+Index: src/gnome-utils/gnc-html-graph-gog.c
+===================================================================
+--- src/gnome-utils/gnc-html-graph-gog.c	(révision 18033)
++++ src/gnome-utils/gnc-html-graph-gog.c	(copie de travail)
+@@ -46,7 +46,22 @@
+ #ifndef GTKHTML_USES_GTKPRINT
+ #    include <goffice/graph/gog-renderer-gnome-print.h>
+ #endif
+-#include <goffice/graph/gog-style.h>
++/* everything inside the following #ifndef can be safely removed when gnucash
++requires libgoffice >= 0.7.5, the contents of the #else block must stay. */
++#ifndef GOG_TYPE_GRAPH
++#	define GOG_TYPE_GRAPH GOG_GRAPH_TYPE
++#	define GO_TYPE_PLUGIN_LOADER_MODULE GO_PLUGIN_LOADER_MODULE_TYPE
++#	define GOG_TYPE_RENDERER GOG_RENDERER_TYPE
++#	include <goffice/graph/gog-style.h>
++#	define GOStyle GogStyle
++#	define go_styled_object_get_style gog_styled_object_get_style
++#	define GO_STYLED_OBJECT GOG_STYLED_OBJECT
++#	define GO_STYLE_FILL_PATTERN GOG_FILL_STYLE_PATTERN
++#	define go_style_set_text_angle gog_style_set_text_angle
++#else
++#	include <goffice/utils/go-style.h>
++#	include <goffice/utils/go-styled-object.h>
++#endif
+ #include <goffice/graph/gog-styled-object.h>
+ #include <goffice/graph/gog-plot.h>
+ #include <goffice/graph/gog-series.h>
+@@ -99,7 +114,7 @@
+   libgoffice_init();
+   
+   /* Initialize plugins manager */
+-  go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_PLUGIN_LOADER_MODULE_TYPE);
++  go_plugins_init (NULL, NULL, NULL, NULL, TRUE, GO_TYPE_PLUGIN_LOADER_MODULE);
+ 
+   gnc_html_register_object_handler( "gnc-guppi-pie", handle_piechart );
+   gnc_html_register_object_handler( "gnc-guppi-bar", handle_barchart );
+@@ -191,7 +206,7 @@
+   gog_object_update (GOG_OBJECT (graph));
+ 
+ #if defined(HAVE_GOFFICE_0_5)
+-  renderer = GOG_RENDERER (g_object_new (GOG_RENDERER_TYPE,
++  renderer = GOG_RENDERER (g_object_new (GOG_TYPE_RENDERER,
+ 					 "model", graph,
+ 					 NULL));
+   update_status = gog_renderer_update (renderer, eb->width, eb->height);
+@@ -231,7 +246,7 @@
+                            GogObject **out_chart,
+                            GogPlot **out_plot)
+ {
+-  *out_graph = g_object_new(GOG_GRAPH_TYPE, NULL);
++  *out_graph = g_object_new(GOG_TYPE_GRAPH, NULL);
+   *out_chart = gog_object_add_by_name(*out_graph, "Chart", NULL);
+   *out_plot = gog_plot_new_by_name(plot_type_name);
+   if (!*out_plot)
+@@ -403,7 +418,7 @@
+   GogObject *graph, *chart;
+   GogPlot *plot;
+   GogSeries *series;
+-  GogStyle *style;
++  GOStyle *style;
+   GOData *label_data, *slice_data;
+   int data_rows, data_cols;
+   double *data = NULL;
+@@ -491,8 +506,8 @@
+       gog_series_set_dim (series, 1, slice_data, NULL);
+       go_data_emit_changed (GO_DATA (slice_data));
+ 
+-      style = gog_styled_object_get_style (GOG_STYLED_OBJECT (series));
+-      style->fill.type = GOG_FILL_STYLE_PATTERN;
++      style = go_styled_object_get_style (GO_STYLED_OBJECT (series));
++      style->fill.type = GO_STYLE_FILL_PATTERN;
+       if (gdk_color_parse (col_colors[i], &color)) {
+            style->fill.auto_back = FALSE;
+            go_pattern_set_solid (&style->fill.pattern, GDK_TO_UINT (color));
+@@ -505,8 +520,8 @@
+   if (rotate_row_labels) {
+     GogObject *object = gog_object_get_child_by_role (
+       chart, gog_object_find_role_by_name (chart, "X-Axis"));
+-    style = gog_styled_object_get_style (GOG_STYLED_OBJECT (object));
+-    gog_style_set_text_angle (style, 90.0);
++    style = go_styled_object_get_style (GO_STYLED_OBJECT (object));
++    go_style_set_text_angle (style, 90.0);
+   }
+ 
+   set_chart_titles_from_hash (chart, eb);
+@@ -688,7 +703,7 @@
+   GogPlot *plot;
+   GogSeries *series;
+   GOData *sliceData;
+-  GogStyle *style;
++  GOStyle *style;
+   int datasize;
+   double *xData, *yData;
+   gchar *marker_str, *color_str;
+@@ -718,7 +733,7 @@
+   }
+ 
+   series = gog_plot_new_series( plot );
+-  style = gog_styled_object_get_style(GOG_STYLED_OBJECT(series));
++  style = go_styled_object_get_style(GO_STYLED_OBJECT(series));
+ 
+   sliceData = go_data_vector_val_new( xData, datasize, NULL );
+   gog_series_set_dim( series, 0, sliceData, NULL );
+@@ -764,15 +779,15 @@
+     go_marker_set_fill_color(style->marker.mark,
+                              go_marker_get_outline_color(style->marker.mark));
+   } else {
+-    GogStyle *chart_style =
+-      gog_styled_object_get_style(GOG_STYLED_OBJECT(chart));
++    GOStyle *chart_style =
++      go_styled_object_get_style(GO_STYLED_OBJECT(chart));
+ 
+-    if (chart_style->fill.type == GOG_FILL_STYLE_PATTERN
++    if (chart_style->fill.type == GO_STYLE_FILL_PATTERN
+         && chart_style->fill.pattern.pattern == GO_PATTERN_SOLID) {
+       style->marker.auto_fill_color = FALSE;
+       go_marker_set_fill_color(style->marker.mark,
+                                chart_style->fill.pattern.back);
+-    } else if (chart_style->fill.type == GOG_FILL_STYLE_PATTERN
++    } else if (chart_style->fill.type == GO_STYLE_FILL_PATTERN
+                && chart_style->fill.pattern.pattern
+                == GO_PATTERN_FOREGROUND_SOLID) {
+       style->marker.auto_fill_color = FALSE;
+@@ -801,7 +816,7 @@
+ {
+   GogGraph *graph = GOG_GRAPH(g_object_get_data(G_OBJECT(eb), "graph"));
+ #    ifdef HAVE_GOFFICE_0_5
+-  GogRenderer *rend = g_object_new(GOG_RENDERER_TYPE, "model", graph, NULL);
++  GogRenderer *rend = g_object_new(GOG_TYPE_RENDERER, "model", graph, NULL);
+ #    else
+   GogRendererCairo *rend = g_object_new(GOG_RENDERER_CAIRO_TYPE, "model", graph,
+                                         "cairo", cr, "is-vector", TRUE, NULL);

gnucash.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Apr 27 16:05:18 CEST 2009 - vuntz@novell.com
+
+- Update to version 2.2.9:
+  + Bugs fixed: bgo#339027, bgo#435642, bgo#438132, bgo#462148,
+    bgo#514455, bgo#526775, bgo#542382, bgo#564209, bgo#564450,
+    bgo#564928, bgo#565421, bgo#565721, bgo#566198, bgo#566352,
+    bgo#566567, bgo#567174, bgo#568327, bgo#568653, bgo#568945,
+    bgo#569734, bgo#570166, bgo#570894, bgo#571220:
+  + Added German account template for a Wohnungswirtschaft business
+  + Fixed french business account templates
+  + Translation updates
+- Add gnucash-latest-goffice.patch to fix compilation with goffice
+  0.7.5.
+- Update gnucash-desktop.patch to apply without fuzz.
+- Remove check for old version of openSUSE.
+- Do not set CFLAGS to default value.
+- Use makeinstall.
+
 -------------------------------------------------------------------
 Mon Dec 29 12:54:13 EST 2008 - mboman@suse.de
 

gnucash.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gnucash (Version 2.2.8)
+# spec file for package gnucash (Version 2.2.9)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           gnucash
-Version:        2.2.8
+Version:        2.2.9
 Release:        1
 Url:            http://www.gnucash.org/
 Group:          Productivity/Office/Finance
@@ -28,6 +28,8 @@ Summary:        Personal Finance Manager
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Patch:          gnucash-desktop.patch
+# PATCH-FIX-UPSTREAM gnucash-latest-goffice.patch bgo578212 vuntz@novell.com -- Fix build with goffice 0.7.5
+Patch1:         gnucash-latest-goffice.patch
 Patch3:         gnucash-cpan-warning.patch
 Requires:       guile slib
 # Required to make quotes working. Gnucash can run without quotes support:
@@ -37,9 +39,7 @@ BuildRequires:  doxygen fdupes gconf2-devel glib2-devel goffice-devel graphviz g
 BuildRequires:  aqbanking-devel libchipcard3 libchipcard3-devel libofx-devel postgresql-devel
 #BuildRequires: callgrind
 # tested but unused BuildRequires: readline-devel qt3-devel termcap
-%if %suse_version > 1000
 Recommends:     gnucash-docs
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %install_info_prereq
 Requires:       %{name}-lang = %{version}
@@ -422,6 +422,7 @@ Authors:
 %prep
 %setup -q
 %patch
+%patch1
 # This patch must be applied:
 %patch3
 # build fix, G_INLINE_FUNC definition in glib2 is broken again for gcc-4.3
@@ -429,7 +430,6 @@ sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in
 
 %build
 export GUILE_WARN_DEPRECATED=no
-export CFLAGS="$RPM_OPT_FLAGS"
 # FIXME: invalid directory somewhere in the source:
 mkdir m4
 ACLOCAL="aclocal -I macros" autoreconf -f -i
@@ -446,7 +446,7 @@ ACLOCAL="aclocal -I macros" autoreconf -f -i
 make %{?jobs:-j%jobs}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+%makeinstall
 cp AUTHORS COPYING ChangeLog ChangeLog.2003 ChangeLog.2004 ChangeLog.2005 DOCUMENTERS HACKING LICENSE NEWS README README.dependencies README.patches TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/
 rm $RPM_BUILD_ROOT%{_docdir}/%{name}/INSTALL
 %suse_update_desktop_file gnucash
@@ -505,6 +505,22 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnucash
 
 %changelog
+* Mon Apr 27 2009 vuntz@novell.com
+- Update to version 2.2.9:
+  + Bugs fixed: bgo#339027, bgo#435642, bgo#438132, bgo#462148,
+  bgo#514455, bgo#526775, bgo#542382, bgo#564209, bgo#564450,
+  bgo#564928, bgo#565421, bgo#565721, bgo#566198, bgo#566352,
+  bgo#566567, bgo#567174, bgo#568327, bgo#568653, bgo#568945,
+  bgo#569734, bgo#570166, bgo#570894, bgo#571220:
+  + Added German account template for a Wohnungswirtschaft business
+  + Fixed french business account templates
+  + Translation updates
+- Add gnucash-latest-goffice.patch to fix compilation with goffice
+  0.7.5.
+- Update gnucash-desktop.patch to apply without fuzz.
+- Remove check for old version of openSUSE.
+- Do not set CFLAGS to default value.
+- Use makeinstall.
 * Mon Dec 29 2008 mboman@suse.de
 - Update to version 2.2.8:
   + Bugs fixed: bgo#115066, bgo#128774, bgo#137017, bgo#339433, bgo#340041,
@@ -523,7 +539,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Oct 03 2008 vuntz@novell.com
 - Add gnucash-goffice0.8.patch to compile with current goffice in
   Factory.
-* Tue Apr 01 2008 maw@suse.de
+* Wed Apr 02 2008 maw@suse.de
 - Update to version 2.2.4:
   + Recognize 401k/403b in QIF import
   + Remove superfluous trailing colons of de_DE SKR04 account names
@@ -551,7 +567,7 @@ rm -rf $RPM_BUILD_ROOT
   the calls to ldconfig
 - But I am changing them this time
 - Also, rename rpmlintrc to gnucash-rpmlintrc.
-* Tue Aug 07 2007 maw@suse.de
+* Wed Aug 08 2007 maw@suse.de
 - Split off a -lang subpackage
 - s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
 * Fri Jul 27 2007 sbrabec@suse.cz
@@ -652,7 +668,7 @@ rm -rf $RPM_BUILD_ROOT
   characters can be transferred to other countries flawlessly.
   * GnuCash Help and Guide are now fully integrated with the
   GNOME Help system (Yelp)
-* Wed Jun 14 2006 schwab@suse.de
+* Thu Jun 15 2006 schwab@suse.de
 - Add workaround for guile bug.
 * Thu May 25 2006 sbrabec@suse.cz
 - Updated to version 1.9.6.
@@ -671,7 +687,7 @@ rm -rf $RPM_BUILD_ROOT
   Based on spec file from Rajesh Singh <rajeshsingh.geo@yahoo.com>.
 * Tue Aug 02 2005 ro@suse.de
 - intltoolize with force
-* Mon Apr 25 2005 gekker@suse.de
+* Tue Apr 26 2005 gekker@suse.de
 - Add Guppi-gcc4.patch to fix GCC4 compile failures.
 * Tue Apr 19 2005 ro@suse.de
 - use gt_LC_MESSAGES instead of AM_LC_MESSAGES
@@ -692,7 +708,7 @@ rm -rf $RPM_BUILD_ROOT
 - fix build with current intltool
 * Thu Nov 04 2004 ro@suse.de
 - locale rename: no -> nb
-* Mon Oct 11 2004 ro@suse.de
+* Tue Oct 12 2004 ro@suse.de
 - added libgcrypt libgpg-error to neededforbuild
 * Mon Mar 29 2004 hhetter@suse.de
 - don't call format, as newer versions of slib don't provide it
@@ -734,7 +750,7 @@ rm -rf $RPM_BUILD_ROOT
 - GNOME prefix change to /opt/gnome.
 * Fri Jun 20 2003 ro@suse.de
 - fix build with current gettext
-* Wed Jun 04 2003 ro@suse.de
+* Thu Jun 05 2003 ro@suse.de
 - remove unpackaged files from buildroot
 - add g-wrap includes to package
 * Wed May 14 2003 mcihar@suse.cz
@@ -754,7 +770,7 @@ rm -rf $RPM_BUILD_ROOT
 - build with libofx support
 * Thu Feb 06 2003 ro@suse.de
 - update to g-wrap-1.3.4 and gnucash-1.8.0
-* Wed Jan 08 2003 ro@suse.de
+* Thu Jan 09 2003 ro@suse.de
 - add AM_GNU_GETTEXT_VERSION and make it build
 - hack for gtkhtml-1.1 and recent guile
 - more makefile hackery to work around cyclic library dependencies
@@ -772,9 +788,9 @@ rm -rf $RPM_BUILD_ROOT
 - %%_lib fixes.
 * Thu Apr 04 2002 schwab@suse.de
 - Fix for new autotools.
-* Sun Feb 17 2002 ro@suse.de
+* Mon Feb 18 2002 ro@suse.de
 - added missing g-wrap runtime lib to filelist (#13472)
-* Thu Jan 31 2002 ro@suse.de
+* Fri Feb 01 2002 ro@suse.de
 - changed neededforbuild <libpng> to <libpng-devel-packages>
 * Wed Jan 23 2002 hhetter@suse.de
 - added python, python-devel to #neededforbuild
@@ -797,7 +813,7 @@ rm -rf $RPM_BUILD_ROOT
 - prefix g-wrap to the original guile interpreter location
 * Tue Nov 27 2001 ro@suse.de
 - back to g-wrap-1.1.10
-* Wed Nov 21 2001 ro@suse.de
+* Thu Nov 22 2001 ro@suse.de
 - update to g-wrap-1.1.11
 - added guppi-include path to cflags
   (gnome-config does not show this path)
@@ -844,7 +860,7 @@ rm -rf $RPM_BUILD_ROOT
 - Added mising stuff to the filelist.
 * Thu Jul 05 2001 uli@suse.de
 - added gal-devel to neededforbuild
-* Wed Jun 20 2001 ro@suse.de
+* Thu Jun 21 2001 ro@suse.de
 - updated filelist
 - cleaned specfile a bit
 * Mon Jun 18 2001 hhetter@suse.de
@@ -857,15 +873,15 @@ rm -rf $RPM_BUILD_ROOT
 - Updated to version 1.4.12. Again just bugfixes.
 * Mon Apr 02 2001 egger@suse.de
 - Updated to version 1.4.11. Pure bugfix release.
-* Tue Mar 20 2001 ro@suse.de
+* Wed Mar 21 2001 ro@suse.de
 - added esound-devel to neededforbuild
-* Thu Mar 01 2001 egger@suse.de
+* Fri Mar 02 2001 egger@suse.de
 - Minor corrections to the specfile.
 * Tue Feb 20 2001 egger@suse.de
 - removed imlib-config from neededforbuild.
 - Updated gnucash to version 1.4.10.
 - Updated g-wrap to version 1.4.12.
-* Tue Jan 30 2001 ro@suse.de
+* Wed Jan 31 2001 ro@suse.de
 - changed neededforbuild <imlibcfe> to <imlib-config>
 * Thu Dec 21 2000 egger@suse.de
 - Updated gnucash to 1.4.9.
@@ -874,12 +890,12 @@ rm -rf $RPM_BUILD_ROOT
 - Recompressed with bzip2.
 * Sun Dec 10 2000 schwab@suse.de
 - Add %%suse_update_config.
-* Sun Nov 05 2000 randall@suse.de
+* Mon Nov 06 2000 randall@suse.de
 -  Removed these two commands.  The guile package will preform these
   actions:
   ln -sf /usr/lib/scheme/slib /usr/share/guile/1.4/slib
   guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
 * Thu Nov 02 2000 randall@suse.de
 - Changed to long file names, also for distro SuSE 7.1a
-* Mon Oct 30 2000 randall@suse.de
+* Tue Oct 31 2000 randall@suse.de
 - Initial Release