rpms/gnucash/devel gnucash-2.2.3-newglib.patch, NONE, 1.1 gnucash.spec, 1.83, 1.84

[Bill Nottingham (notting)]

Author: notting

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

Modified Files:
	gnucash.spec 
Added Files:
	gnucash-2.2.3-newglib.patch 
Log Message:
fix build against new glib. rebuild against new goffice


gnucash-2.2.3-newglib.patch:

--- NEW FILE gnucash-2.2.3-newglib.patch ---
diff -ru gnucash-2.2.3/src/engine/SplitP.h gnucash-2.2.3/src/engine/SplitP.h
--- gnucash-2.2.3/src/engine/SplitP.h	2008-01-07 20:06:44.000000000 -0500
+++ gnucash-2.2.3/src/engine/SplitP.h	2008-01-25 21:35:17.000000000 -0500
@@ -149,7 +149,7 @@
 Split * xaccSplitClone (const Split *s);
 
 Split *xaccDupeSplit (const Split *s);
-G_INLINE_FUNC void mark_split (Split *s);
+void mark_split (Split *s);
 
 void xaccSplitVoid(Split *split);
 void xaccSplitUnvoid(Split *split);


Index: gnucash.spec
===================================================================
RCS file: /cvs/extras/rpms/gnucash/devel/gnucash.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- gnucash.spec	9 Jan 2008 03:38:22 -0000	1.83
+++ gnucash.spec	26 Jan 2008 03:25:08 -0000	1.84
@@ -4,18 +4,19 @@
 Summary: GnuCash is an application to keep track of your finances
 Version: 2.2.3
 URL: http://gnucash.org/
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Productivity
 Source: http://www.gnucash.org/pub/gnucash/sources/stable/gnucash-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkhtml3-devel
-BuildRequires: libgsf-devel >= 1.12.2, goffice04-devel, swig
+BuildRequires: libgsf-devel >= 1.12.2, goffice-devel, swig
 BuildRequires: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0
 BuildRequires: libofx-devel, aqbanking-devel, guile-devel
 BuildRequires: desktop-file-utils, texinfo
 BuildRequires: gettext, slib >= 3a1-5, libtool, intltool
 Patch: gnucash-quiet.patch
+Patch2: gnucash-2.2.3-newglib.patch
 Requires: gnucash-docs >= 2.2.0
 Requires: slib >= 3a1-5
 Requires: perl(Finance::Quote)
@@ -37,6 +38,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch2 -p1
 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \;
 
 %build
@@ -128,6 +130,9 @@
 %doc doc/README.german doc/README.francais doc/guile-hackers.txt
 
 %changelog
+* Fri Jan 25 2008 Bill Nottingham <notting at redhat.com> - 2.2.3-2
+- rebuild against new goffice
+
 * Tue Jan  8 2008 Bill Nottingham <notting at redhat.com> - 2.2.3-1
 - update to 2.2.3