From 39935cb6a6c795c36946f9077f22fbffe0f42491 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Jun 03 2010 18:45:33 +0000 Subject: Fix build, fix bug where latvian account trees overwrite the C/english ones. --- diff --git a/gnucash-latvian.patch b/gnucash-latvian.patch new file mode 100644 index 0000000..fbb6f11 --- /dev/null +++ b/gnucash-latvian.patch @@ -0,0 +1,22 @@ +diff -up gnucash-2.3.13/accounts/lv_LV/Makefile.am.foo gnucash-2.3.13/accounts/lv_LV/Makefile.am +--- gnucash-2.3.13/accounts/lv_LV/Makefile.am.foo 2010-06-03 14:33:44.429101189 -0400 ++++ gnucash-2.3.13/accounts/lv_LV/Makefile.am 2010-06-03 14:33:27.314976349 -0400 +@@ -1,5 +1,5 @@ + +-accountdir = ${GNC_ACCOUNTS_DIR}/C ++accountdir = ${GNC_ACCOUNTS_DIR}/lv + + account_DATA = \ + acctchrt_brokerage.gnucash-xea \ +diff -up gnucash-2.3.13/accounts/lv_LV/Makefile.in.foo gnucash-2.3.13/accounts/lv_LV/Makefile.in +--- gnucash-2.3.13/accounts/lv_LV/Makefile.in.foo 2010-06-03 14:33:11.771850295 -0400 ++++ gnucash-2.3.13/accounts/lv_LV/Makefile.in 2010-06-03 14:33:21.275100385 -0400 +@@ -331,7 +331,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-accountdir = ${GNC_ACCOUNTS_DIR}/C ++accountdir = ${GNC_ACCOUNTS_DIR}/lv + account_DATA = \ + acctchrt_brokerage.gnucash-xea \ + acctchrt_business.gnucash-xea \ diff --git a/gnucash-libdbi.patch b/gnucash-libdbi.patch deleted file mode 100644 index f955eae..0000000 --- a/gnucash-libdbi.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up gnucash-2.3.12/src/backend/dbi/gnc-backend-dbi.c.foo gnucash-2.3.12/src/backend/dbi/gnc-backend-dbi.c ---- gnucash-2.3.12/src/backend/dbi/gnc-backend-dbi.c.foo 2010-05-18 12:36:31.929812252 -0400 -+++ gnucash-2.3.12/src/backend/dbi/gnc-backend-dbi.c 2010-05-18 12:38:29.962687968 -0400 -@@ -1007,7 +1007,6 @@ void - gnc_module_init_backend_dbi(void) - { - QofBackendProvider *prov; --#define DEFAULT_DBD_DIR "/usr/lib/dbd" - const gchar* driver_dir; - int num_drivers; - gboolean have_sqlite3_driver = FALSE; -@@ -1019,8 +1018,7 @@ gnc_module_init_backend_dbi(void) - driver_dir = g_getenv( "GNC_DBD_DIR" ); - if ( driver_dir == NULL ) - { -- PWARN( "GNC_DBD_DIR not set: using %s\n", DEFAULT_DBD_DIR ); -- driver_dir = DEFAULT_DBD_DIR; -+ PWARN( "GNC_DBD_DIR not set: using libdi built-in default\n"); - } - - num_drivers = dbi_initialize( driver_dir ); -diff -up gnucash-2.3.12/configure.cow gnucash-2.3.12/configure ---- gnucash-2.3.12/configure.cow 2010-05-18 12:59:45.105061535 -0400 -+++ gnucash-2.3.12/configure 2010-05-18 12:59:46.353810836 -0400 -@@ -1788,16 +1791,16 @@ Optional Packages: - --with-qt3-wizard-package=name - name of package containing qt3-wizard (aqbanking) - --with-dbi-dbd-dir=PATH specify location of libdbi drivers -- [default=/usr/lib/dbd] -+ [default=${libdir}/dbd] - --with-ofx-prefix=DIR specify where to look for libOFX - --with-test-mysql-url=URL -- MySQL database URL for testing default=none -+ MySQL database URL for testing [default=none] - --with-test-pgsql-url=URL -- PgSQL database URL for testing default=none -+ PgSQL database URL for testing [default=none] - --with-help-prefix=PATH specify where to store the help files - --with-perl=FILE which perl executable to use - --with-html-engine=[webkit/gtkhtml] -- Select HTML engine default=gtkhtml -+ Select HTML engine [default=gtkhtml] - - Some influential environment variables: - CC C compiler command -@@ -16328,7 +16355,7 @@ done - if test "${with_dbi_dbd_dir+set}" = set; then : - withval=$with_dbi_dbd_dir; GNC_DBD_DIR="$with_dbi_dbd_dir" - else -- GNC_DBD_DIR="/usr/lib/dbd" -+ GNC_DBD_DIR="${libdir}/dbd" - fi - - diff --git a/gnucash.spec b/gnucash.spec index f25c3b3..4d65df8 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -17,6 +17,7 @@ BuildRequires: desktop-file-utils, texinfo BuildRequires: gettext, slib >= 3a1-5, libtool, intltool BuildRequires: python-devel, libdbi-devel Patch0: gnucash-quiet.patch +Patch1: gnucash-latvian.patch Requires: gnucash-docs >= 2.2.0 Requires: slib >= 3a1-5 Requires: perl(Finance::Quote) @@ -38,6 +39,7 @@ balanced books. %prep %setup -q %patch0 -p1 +%patch1 -p1 find src/quotes -name "*.in" -exec sed -i "s|use lib '@-PERLINCL-@';||g" {} \; %build @@ -118,7 +120,6 @@ fi %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug -%{_datadir}/xml/* %{_datadir}/gnucash %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/apps/*