From 1112d8da34e75c6bd4e36aba0d33060a1aedd3cfa87e5e6715d0780937db018a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 9 Mar 2012 20:22:54 +0000 Subject: [PATCH] Accepting request 106886 from GNOME:Apps Update to 2.4.10 (forwarded request 106785 from vuntz) OBS-URL: https://build.opensuse.org/request/show/106886 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnucash?expand=0&rev=42 --- gnucash-2.4.10.tar.bz2 | 3 ++ gnucash-2.4.8.tar.bz2 | 3 -- gnucash-desktop.patch | 24 ---------- gnucash-fix-python-install.patch | 21 +++++++++ gnucash-glib-2.31.patch | 14 ------ gnucash-guile-2.0.patch | 43 ------------------ gnucash.changes | 77 ++++++++++++++++++++++++++++++++ gnucash.spec | 76 ++++++++++++++++++++++--------- 8 files changed, 157 insertions(+), 104 deletions(-) create mode 100644 gnucash-2.4.10.tar.bz2 delete mode 100644 gnucash-2.4.8.tar.bz2 delete mode 100644 gnucash-desktop.patch create mode 100644 gnucash-fix-python-install.patch delete mode 100644 gnucash-glib-2.31.patch delete mode 100644 gnucash-guile-2.0.patch diff --git a/gnucash-2.4.10.tar.bz2 b/gnucash-2.4.10.tar.bz2 new file mode 100644 index 0000000..15e182d --- /dev/null +++ b/gnucash-2.4.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52e65623b5ad812b8eeb4c221951e9b0ba3c49e28916acfb7b92566da159e6cc +size 9367104 diff --git a/gnucash-2.4.8.tar.bz2 b/gnucash-2.4.8.tar.bz2 deleted file mode 100644 index 34c92d2..0000000 --- a/gnucash-2.4.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4aa11e7746bb5105682a223f9baf97200ecf2a1fcddbf871626805ac097fee19 -size 9345232 diff --git a/gnucash-desktop.patch b/gnucash-desktop.patch deleted file mode 100644 index 9117bf4..0000000 --- a/gnucash-desktop.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/gnome/gnucash.desktop.in -+++ src/gnome/gnucash.desktop.in -@@ -2,7 +2,8 @@ - Type=Application - MimeType=application/x-gnucash; - Version=0.9.4 --_Name=GnuCash Finance Management -+_Name=GnuCash -+_GenericName=Finance Management - _Comment=Manage your finances, accounts, and investments - Exec=gnucash %f - Icon=gnucash-icon ---- src/gnome/gnucash.desktop.in.in -+++ src/gnome/gnucash.desktop.in.in -@@ -2,7 +2,8 @@ - Type=Application - MimeType=application/x-gnucash; - Version=0.9.4 --_Name=GnuCash Finance Management -+_Name=GnuCash -+_GenericName=Finance Management - _Comment=Manage your finances, accounts, and investments - Exec=gnucash %f - Icon=gnucash-icon diff --git a/gnucash-fix-python-install.patch b/gnucash-fix-python-install.patch new file mode 100644 index 0000000..d04850b --- /dev/null +++ b/gnucash-fix-python-install.patch @@ -0,0 +1,21 @@ +Index: gnucash-2.4.9/src/optional/python-bindings/Makefile.am +=================================================================== +--- gnucash-2.4.9.orig/src/optional/python-bindings/Makefile.am ++++ gnucash-2.4.9/src/optional/python-bindings/Makefile.am +@@ -2,7 +2,7 @@ SUBDIRS = . tests + + SWIG_FILES = gnucash_core.i timespec.i + +-pkgpython_PYTHON = \ ++pkgpyexec_DATA = \ + __init__.py \ + function_class.py \ + gnucash_core.py \ +@@ -85,6 +85,7 @@ gnucash_core_c.py: gnucash_core.c $(SWIG + endif + + EXTRA_DIST = \ ++ $(pkgpyexec_DATA) \ + $(SWIG_FILES) \ + example_scripts/simple_book.py \ + example_scripts/simple_session.py \ diff --git a/gnucash-glib-2.31.patch b/gnucash-glib-2.31.patch deleted file mode 100644 index 219f263..0000000 --- a/gnucash-glib-2.31.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: gnucash-2.4.8/src/gnome-utils/gnc-frequency.c -=================================================================== ---- gnucash-2.4.8.orig/src/gnome-utils/gnc-frequency.c -+++ gnucash-2.4.8/src/gnome-utils/gnc-frequency.c -@@ -25,8 +25,8 @@ - - #include "config.h" - -+#include - #include --#include - #include - #include - diff --git a/gnucash-guile-2.0.patch b/gnucash-guile-2.0.patch deleted file mode 100644 index 71665f4..0000000 --- a/gnucash-guile-2.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -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/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\" diff --git a/gnucash.changes b/gnucash.changes index f9f9bed..da9f708 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Fri Feb 24 09:37:45 UTC 2012 - vuntz@opensuse.org + +- Update to version 2.4.10: + + Update txf.scm to reflect changes to US Income Tax Forms and + Schedules for 2011. + + Turn on AQBAnking 5. + + Various code changes. + + Windows-specific fixes. + + Build fixes. + + Bugs fixed: bgo#666849, bgo#667417, bgo#667900. + + Updated translations. +- Drop gnucash-glib-2.31.patch: fixed upstream. +- On 12.1 and later, change back guile1 Requires to + libguile1-devel: this is apparently still needed for some weird + reason. +- After discussion in bnc#743565, update license from GPL-2.0+ to + SUSE-GPL-2.0-with-openssl-exception or + SUSE-GPL-3.0-with-openssl-exception. + +------------------------------------------------------------------- +Sun Feb 12 16:38:32 UTC 2012 - dimstar@opensuse.org + +- Support building on openSUSE < 12.1 by conditionally changing: + + libguile1-devel BuildRequires to guile-devel + + guile1 Requires to guile + + libguile1-devel Requires in the -devel package to guile-devel. + + Don't do the hackery in %build to switch to guile1. + +------------------------------------------------------------------- +Wed Jan 25 12:21:21 UTC 2012 - vuntz@opensuse.org + +- Change libguile1-devel Requires to guile1: I don't think we need + the devel package. + +------------------------------------------------------------------- +Mon Jan 23 11:59:02 UTC 2012 - pgajdos@suse.com + +- Fuild against guile1 [bnc#724917]: + + Drop gnucash-guile-2.0.patch: stop trying to port to guile 2.0. + + Change guile-devel BuildRequires to libguile1-devel. + + Change guile Requires to libguile1-devel. + + Change guile-devel Requires in devel subpackage to + libguile1-devel. + + In %build, use some sed hacks and export GUILE environment + variable to force the use of guile 1.x. + +------------------------------------------------------------------- +Wed Jan 18 15:18:46 UTC 2012 - vuntz@opensuse.org + +- Update to version 2.4.9: + + Various code changes. + + Don't install a script that is only used for building and + testing. This fixes Secunia Advisory SA42048. + + Bugs fixed: + - bgo#457401: Enable printing for unposted invoices. + - bgo#664764: Added Swedish chart of accounts for small + businesses. + - bgo#664862: Added new line chart report for assets. + - bgo#630804, bgo#639082, bgo#642276, bgo#649362, bgo#658247, + bgo#661383, bgo#662477, bgo#663368, bgo#663638, bgo#665202, + bgo#665998, bgo#666329, bgo#667105, bgo#667276. +- Drop gnucash-desktop.patch: fixed upstream. +- Build python bindings: + + Add python-devel BuildRequires. + + Pass --enable-python-bindings to configure. + + Create python-gnucash subpackage for the python bindings. + + Add gnucash-fix-python-install.patch: correctly install the + bindings so that they work. + + Add call to autoreconf for the patch. +- Add gtkmm support for plugins: + + Add gcc-c++ and pkgconfig(gtkmm-2.4) BuildRequires. + + Pass --enable-gtkmm to configure. +- Remove %install_info_prereq PreReq and use of + %install_info/%install_info_delete in scriptlets, following + removal of an info page. + ------------------------------------------------------------------- Fri Jan 6 14:50:31 UTC 2012 - vuntz@opensuse.org diff --git a/gnucash.spec b/gnucash.spec index fb35ab0..155dec6 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -17,30 +17,32 @@ Name: gnucash -Version: 2.4.8 +Version: 2.4.10 Release: 0 Summary: Personal Finance Manager -License: GPL-2.0+ +License: SUSE-GPL-2.0-with-openssl-exception or SUSE-GPL-3.0-with-openssl-exception Group: Productivity/Office/Finance Url: http://www.gnucash.org/ -Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.4.8/%{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/gnucash/gnucash%20%28stable%29/2.4.10/%{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches -Patch: gnucash-desktop.patch +# PATCH-FIX-UPSTREAM gnucash-fix-python-install.patch bgo#668196 vuntz@opensuse.org -- Fix installation of python bindings +Patch0: gnucash-fix-python-install.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 -# PATCH-FIX-UPSTREAM gnucash-glib-2.31.patch bgo#667417 vuntz@opensuse.org -- Fix build with glib 2.31 (single include) -Patch5: gnucash-glib-2.31.patch BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: guile-devel +BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: libdbi-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: libguile1-devel +%else +BuildRequires: guile-devel +%endif BuildRequires: libofx-devel BuildRequires: libtool +BuildRequires: python-devel >= 2.4 BuildRequires: slib BuildRequires: update-desktop-files BuildRequires: pkgconfig(aqbanking) @@ -48,6 +50,7 @@ BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtkmm-2.4) >= 2.16 BuildRequires: pkgconfig(gwengui-gtk2) BuildRequires: pkgconfig(gwenhywfar) BuildRequires: pkgconfig(libglade-2.0) @@ -57,8 +60,14 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(webkit-1.0) #BuildRequires: callgrind # tested but unused BuildRequires: readline-devel qt3-devel termcap -PreReq: %install_info_prereq +%if %{?suse_version} >= 1210 +# FIXME: guile1 should be enough, but: +# ERROR: In procedure dynamic-link: +# ERROR: file: "libguile-srfi-srfi-1-v-3", message: "file not found" +Requires: libguile1-devel +%else Requires: guile +%endif # Required to make quotes working. Gnucash can run without quotes support: Requires: perl-Crypt-SSLeay Requires: perl-Date-Manip @@ -80,13 +89,31 @@ of your finances. The interface is designed to be simple and easy to use, but is backed with double-entry accounting principles to ensure balanced books. +%package -n python-gnucash +Summary: Python bindings for GnuCash +Group: Development/Libraries/Python +Requires: %{name} = %{version} +%py_requires + +%description -n python-gnucash +GnuCash is a personal finance manager. A check-book like register GUI +allows you to enter and track bank accounts, stocks, income and even +currency trades. A full set of reports allow you to see the state of +your finances. The interface is designed to be simple and easy to use, +but is backed with double-entry accounting principles to ensure +balanced books. + %package devel Summary: Personal Finance Manager Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: gconf2-devel Requires: gtk2-devel +%if %{?suse_version} >= 1210 +Requires: libguile1-devel +%else Requires: guile-devel +%endif Requires: libglade2-devel Requires: libgnomeui-devel @@ -101,13 +128,18 @@ balanced books. %lang_package %prep %setup -q -%patch +%patch0 -p1 # This patch must be applied: %patch3 -%patch4 -p1 -%patch5 -p1 %build +%if %{?suse_version} >= 1210 +# needed for patch0 and use of guile1 +sed -i "s:GUILE_MODULE_AVAILABLE:GUILE1_MODULE_AVAILABLE:" configure.ac +autoreconf -fi +sed -i "s:guile-config:guile1-config:" configure +export GUILE=/usr/bin/guile1 +%endif %configure\ --disable-schemas-install\ --libexecdir=%{_libexecdir}\ @@ -116,7 +148,9 @@ balanced books. --enable-locale-specific-tax\ --enable-html-docs\ --with-html-engine=webkit\ - --enable-dbi + --enable-dbi\ + --enable-gtkmm\ + --enable-python-bindings make %{?_smp_mflags} %install @@ -128,6 +162,7 @@ rm %{buildroot}%{_bindir}/update-gnucash-gconf %find_gconf_schemas cat %{name}.schemas_list %fdupes %{buildroot}%{_datadir} +%fdupes %{buildroot}%{python_sitearch} %clean rm -rf %{buildroot} @@ -136,7 +171,6 @@ rm -rf %{buildroot} %post /sbin/ldconfig -%install_info --info-dir=%{_infodir} %{_infodir}/gnucash-design.info.gz %if 0%{?suse_version} > 1130 %desktop_database_post %icon_theme_cache_post @@ -148,7 +182,6 @@ rm -rf %{buildroot} %postun /sbin/ldconfig -%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnucash-design.info.gz %if 0%{?suse_version} > 1130 %desktop_database_postun %icon_theme_cache_postun @@ -156,8 +189,8 @@ rm -rf %{buildroot} %files -f %{name}.schemas_list %defattr (-, root, root) +%doc AUTHORS COPYING LICENSE README %{_bindir}/gnc-fq-* -%{_bindir}/gnc-test-env %{_bindir}/gnucash %{_bindir}/gnucash-env %{_bindir}/gnucash-make-guids @@ -172,7 +205,6 @@ rm -rf %{buildroot} # NOTE: .la files are required by ltdl in the main package (skip-check-libtool-deps) %{_libdir}/*.la %{_libdir}/gnucash -%doc %{_infodir}/gnucash-design.info* %doc %{_mandir}/man?/*.* %if "%{_libdir}" != "%{_libexecdir}" %{_libexecdir}/gnucash @@ -181,10 +213,14 @@ rm -rf %{buildroot} %config %{_sysconfdir}/gnucash/config %config %{_sysconfdir}/gnucash/environment -%files lang -f %{name}.lang +%files -n python-gnucash +%defattr (-, root, root) +%{python_sitearch}/gnucash/ %files devel %defattr (-, root, root) %{_includedir}/gnucash/ +%files lang -f %{name}.lang + %changelog