diff --git a/gnucash-2.2.0.tar.bz2 b/gnucash-2.2.0.tar.bz2 deleted file mode 100644 index e8baec9..0000000 --- a/gnucash-2.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68edd2bc610f5bd387672a7f04271afb2939c819604253cc15065ac7d3c6d47f -size 7055247 diff --git a/gnucash-2.2.3.tar.bz2 b/gnucash-2.2.3.tar.bz2 new file mode 100644 index 0000000..1cafc59 --- /dev/null +++ b/gnucash-2.2.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c52c73477cf4b37c07dd25abafeaa63b74e0d2168f2b7469081ed31092a545f2 +size 6949569 diff --git a/gnucash-address-boolean.patch b/gnucash-address-boolean.patch deleted file mode 100644 index bfd4bbb..0000000 --- a/gnucash-address-boolean.patch +++ /dev/null @@ -1,30 +0,0 @@ -TransLog.c: In function 'xaccTransWriteLog': -TransLog.c:254: warning: the address of 'dnow' will always evaluate as 'true' -TransLog.c:254: warning: the address of 'dent' will always evaluate as 'true' -TransLog.c:254: warning: the address of 'dpost' will always evaluate as 'true' -TransLog.c:254: warning: the address of 'drecn' will always evaluate as 'true' -================================================================================ ---- src/engine/TransLog.c -+++ src/engine/TransLog.c -@@ -256,9 +256,9 @@ - "%s\t%s\t%s\t%s\t%c\t%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT "\t%" G_GINT64_FORMAT "/%" G_GINT64_FORMAT "\t%s\n", - flag, - trans_guid_str, split_guid_str, /* trans+split make up unique id */ -- dnow ? dnow : "", -- dent ? dent : "", -- dpost ? dpost : "", -+ dnow[0] ? dnow : "", -+ dent[0] ? dent : "", -+ dpost[0] ? dpost : "", - acc_guid_str, - accname ? accname : "", - trans->num ? trans->num : "", -@@ -271,7 +271,7 @@ - gnc_numeric_denom(amt), - gnc_numeric_num(val), - gnc_numeric_denom(val), -- drecn ? drecn : ""); -+ drecn[0] ? drecn : ""); - } - - fprintf (trans_log, "===== END\n"); diff --git a/gnucash-desktop.patch b/gnucash-desktop.patch index 7729a6c..f421175 100644 --- a/gnucash-desktop.patch +++ b/gnucash-desktop.patch @@ -22,7 +22,7 @@ _Comment=Manage your finances, accounts, and investments Exec=gnucash %f -Icon=gnucash-icon -+Icon=gnucash-icon-48x48 ++Icon=gnucash-icon StartupNotify=true Terminal=false Categories=Application;Office;Finance; diff --git a/gnucash-marksplit.patch b/gnucash-marksplit.patch new file mode 100644 index 0000000..e7852aa --- /dev/null +++ b/gnucash-marksplit.patch @@ -0,0 +1,11 @@ +--- src/engine/SplitP.h ++++ src/engine/SplitP.h +@@ -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); diff --git a/gnucash-qt3-wizard.patch b/gnucash-qt3-wizard.patch deleted file mode 100644 index 21c627b..0000000 --- a/gnucash-qt3-wizard.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- configure.in -+++ configure.in -@@ -542,6 +542,10 @@ - - AC_ARG_WITH(qof, [ --with-qof=path prefix for Query Object Framework - QOF (auto)], - [gnc_with_qof=$withval], [gnc_with_qof=yes]) -+AC_ARG_WITH(qt3_wizard_package, -+ [ --with-qt3-wizard-package=name name of package containing qt3-wizard (aqbanking)], -+ [QT3_WIZARD_PACKAGE=$withval], [QT3_WIZARD_PACKAGE=aqbanking]) -+AC_DEFINE_UNQUOTED([QT3_WIZARD_PACKAGE],["$QT3_WIZARD_PACKAGE"],[Name of package containing qt3-wizard.]) - - # GnuCash builds without deprecated QOF code so needs latest version. - QOF_REQUIRED=0.6.4 ---- src/import-export/hbci/druid-hbci-initial.c -+++ src/import-export/hbci/druid-hbci-initial.c -@@ -685,10 +685,10 @@ - (info->window, - _("The external program \"AqBanking Setup Wizard\" has not " - "been found. \n\n" -- "The aqbanking package should include the " -+ "The %s package should include the " - "program \"qt3-wizard\". Please check your installation to " - "ensure this program is present. On some distributions this " -- "may require installing additional packages.")); -+ "may require installing additional packages."), QT3_WIZARD_PACKAGE); - druid_disable_next_button(info); - } - g_free (backend_name); diff --git a/gnucash.changes b/gnucash.changes index b7a805f..8ea94e3 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 28 17:21:20 CET 2008 - ro@suse.de + +- update to 2.3.3 + - many bugfixes, but still no support for aqbanking3 + ------------------------------------------------------------------- Wed Feb 6 18:56:32 CET 2008 - sbrabec@suse.cz diff --git a/gnucash.spec b/gnucash.spec index b1d242f..db23202 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -1,5 +1,5 @@ # -# spec file for package gnucash (Version 2.2.0) +# spec file for package gnucash (Version 2.2.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,9 +10,10 @@ # norootforbuild + Name: gnucash -Version: 2.2.0 -Release: 81 +Version: 2.2.3 +Release: 1 Url: http://www.gnucash.org/ Group: Productivity/Office/Finance License: GPL v2 or later @@ -20,15 +21,14 @@ Summary: Personal Finance Manager Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Patch: gnucash-desktop.patch -Patch1: gnucash-address-boolean.patch -Patch2: gnucash-qt3-wizard.patch Patch3: gnucash-cpan-warning.patch +Patch4: gnucash-marksplit.patch Requires: guile slib # Required to make quotes working. Gnucash can run without quotes support: Requires: perl-Crypt-SSLeay perl-DateManip perl-Finance-Quote perl-HTML-Parser perl-HTML-TableExtract perl-libwww-perl BuildRequires: doxygen fdupes gconf2-devel glib2-devel goffice-devel graphviz gtk2-devel gtkhtml2-devel guile-devel intltool ktoblzcheck-devel libglade2-devel libgnomeprintui-devel libgnomeui-devel libofx-devel libxml2-devel popt-devel slib swig update-desktop-files # Optional features: -BuildRequires: aqbanking-devel libofx-devel postgresql-devel +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 @@ -415,10 +415,10 @@ Authors: %prep %setup -q %patch -%patch1 -%patch2 # This patch must be applied: %patch3 +# build fix, G_INLINE_FUNC definition in glib2 is broken again for gcc-4.3 +%patch4 sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in # Potentially conflicts with pkg-config: rm macros/pkg.m4 @@ -476,7 +476,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/*gnucash-[a-bd-z]* %{_datadir}/applications/*.desktop %{_datadir}/gnucash -%{_datadir}/pixmaps/*.png +#%{_datadir}/pixmaps/*.png +/usr/share/icons/hicolor/*/apps/gnucash-icon.png +/usr/share/icons/hicolor/scalable/apps/gnucash-icon.svg %{_datadir}/xml/gnucash %{_libdir}/*.so.* # Required by slib for many libraries: @@ -499,6 +501,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/gnucash %changelog +* Thu Feb 28 2008 ro@suse.de +- update to 2.3.3 + - many bugfixes, but still no support for aqbanking3 * Wed Feb 06 2008 sbrabec@suse.cz - Warn users before upgrading packages from CPAN. * Tue Nov 27 2007 sbrabec@suse.cz