diff --git a/gnucash-qt3-wizard.patch b/gnucash-qt3-wizard.patch new file mode 100644 index 0000000..21c627b --- /dev/null +++ b/gnucash-qt3-wizard.patch @@ -0,0 +1,28 @@ +--- 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 96251f4..ca4e021 100644 --- a/gnucash.changes +++ b/gnucash.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 27 15:58:26 CET 2007 - sbrabec@suse.cz + +- Report correct name of package containing qt3-wizard (#310886). + ------------------------------------------------------------------- Thu Oct 11 14:28:25 CEST 2007 - sbrabec@suse.cz diff --git a/gnucash.spec b/gnucash.spec index c8f487b..dd127da 100644 --- a/gnucash.spec +++ b/gnucash.spec @@ -12,7 +12,7 @@ Name: gnucash Version: 2.2.0 -Release: 39 +Release: 62 Url: http://www.gnucash.org/ Group: Productivity/Office/Finance License: GPL v2 or later @@ -21,6 +21,7 @@ Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Patch: gnucash-desktop.patch Patch1: gnucash-address-boolean.patch +Patch2: gnucash-qt3-wizard.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 @@ -414,6 +415,7 @@ Authors: %setup -q %patch %patch1 +%patch2 sed -i "s:^\(GNC_DOC_INSTALL_DIR=\).*$:\1'%{_docdir}/%{name}':" configure.in # Potentially conflicts with pkg-config: rm macros/pkg.m4 @@ -426,6 +428,7 @@ mkdir m4 ACLOCAL="aclocal -I macros" autoreconf -f -i %configure\ --disable-schemas-install\ + --with-qt3-wizard-package=aqbanking-qt3\ --libexecdir=%{_prefix}/lib\ --enable-sql\ --enable-ofx\ @@ -491,7 +494,10 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr (-, root, root) %{_includedir}/gnucash + %changelog +* Tue Nov 27 2007 - sbrabec@suse.cz +- Report correct name of package containing qt3-wizard (#310886). * Thu Oct 11 2007 - sbrabec@suse.cz - Removed false dependency on g-wrap-devel (#331963). * Thu Aug 23 2007 - sbrabec@suse.cz