Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2018-01-19 11:51:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney" Fri Jan 19 11:51:11 2018 rev:55 rq:560617 version:4.8.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2017-08-28 15:18:53.134221468 +0200 +++ /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney.changes 2018-01-19 11:51:43.267857776 +0100 @@ -1,0 +2,49 @@ +Fri Dec 29 20:24:04 UTC 2017 - [email protected] + +- Add fix-sepa-plugin.patch to fix the installation of the SEPA + plugin so that it can actually be loaded (kde#386547) + +------------------------------------------------------------------- +Wed Dec 27 07:48:09 UTC 2017 - [email protected] + +- Update to 4.8.1.1 + * Improvements to data import, including: + + Improved payee matching + + Avoid crash if you provide an invalid name for the import + file + + Resolved numerous issues with importing QIF and CSV files + + Removed some restrictions on the type of account to which + data can be imported + + Allowed OFX import to use Client UID, required by some banks + * Improvements to the database back end + + Avoid a crash if the database is not present restoring from + hibernation + + Corrected SQL syntax issues causing errors + * The user is now notified if changing a memo in a transaction + would make it different from the memo in the other split of the + transaction (such as in a transfer) + * Added a setting to configure location of optional log file for + imported data + * Removed restriction on configuring VAT assignments for certain + types of accounts + * Eliminated false positive errors from Consistency Check + * Several improvements to importing and exporting templates + * Eliminated several causes of crashes +- Drop patches that have been merged upstream: + * kmymoney-4.8.0-fix-csv-import-account-type.patch + * fix-build.patch + * fix-build-with-cmake-3.9.patch +- Rebase aqbanking-5.1-backward-compatibility.patch +- Drop BuildIgnore again, no longer necessary as libqt4 uses + OpenSSL 1.1 now in Tumbleweed +- No longer necessary to change the file permissions of the appdata + file, this has been fixed upstream +- Adjust package summary and description (for KDE4 -> by KDE) + +------------------------------------------------------------------- +Mon Dec 11 12:59:34 UTC 2017 - [email protected] + +- BuildIgnore libopenssl-1_0_0-devel to avoid an openssl conflict + and fix the build on Tumbleweed + +------------------------------------------------------------------- Old: ---- fix-build-with-cmake-3.9.patch fix-build.patch kmymoney-4.8.0-fix-csv-import-account-type.patch kmymoney-4.8.0.tar.xz New: ---- fix-sepa-plugin.patch kmymoney-4.8.1.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.OuwGVp/_old 2018-01-19 11:51:44.655792355 +0100 +++ /var/tmp/diff_new_pack.OuwGVp/_new 2018-01-19 11:51:44.655792355 +0100 @@ -17,21 +17,17 @@ Name: kmymoney -Version: 4.8.0 +Version: 4.8.1.1 Release: 0 -Summary: A Personal Finance Manager for KDE 4 +Summary: A Personal Finance Manager by KDE License: GPL-2.0 or GPL-3.0 Group: Productivity/Office/Finance Url: http://www.kmymoney.org/ Source0: http://download.kde.org/stable/kmymoney/%{version}/src/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM kmymoney-4.8.0-fix-csv-import-account-type.patch kde#364425 -Patch1: kmymoney-4.8.0-fix-csv-import-account-type.patch -# PATCH-FIX-UPSTREAM fix-build.patch -- fix build with latest cmake in Factory -Patch2: fix-build.patch # PATCH-FIX-OPENSUSE aqbanking-5.1-backward-compatibility.patch boo#1042760 -- allow to build the kbanking plugin on Leap 42 -Patch3: aqbanking-5.1-backward-compatibility.patch -# PATCH-FIX-UPSTREAM fix-build-with-cmake-3.9.patch kde#383351 -- fix build with latest cmake in Factory -Patch4: fix-build-with-cmake-3.9.patch +Patch: aqbanking-5.1-backward-compatibility.patch +# PATCH-FIX-UPSTREAM +Patch1: fix-sepa-plugin.patch BuildRequires: aqbanking-devel %if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel @@ -67,7 +63,7 @@ Requires(postun): shared-mime-info %description -KMyMoney is a Personal Finance Manager for KDE4. It operates +KMyMoney is a Personal Finance Manager by KDE. It operates similar to Quicken, supports various account types, categorization of expenses, multiple currencies, online banking support via QIF, OFX and HBCI, budgeting and a rich set of reports. @@ -92,12 +88,10 @@ %prep %setup -q -%patch1 -p1 -%patch2 -p1 %if 0%{suse_version} <= 1320 -%patch3 -p1 +%patch -p1 %endif -%patch4 -p1 +%patch1 -p1 %build %cmake_kde4 -d build @@ -124,9 +118,9 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog ChangeLog.original README.Fileformats %dir %{_kde4_appsdir}/appdata -%attr(644, -, -) %{_kde4_appsdir}/appdata/kmymoney.appdata.xml +%{_kde4_appsdir}/appdata/org.kde.kmymoney.appdata.xml %{_datadir}/mime/packages/x-kmymoney.xml -%{_kde4_applicationsdir}/kmymoney.desktop +%{_kde4_applicationsdir}/org.kde.kmymoney.desktop %{_kde4_appsdir}/kconf_update/kmymoney.upd %{_kde4_appsdir}/kmm_*/ %{_kde4_appsdir}/kmymoney/ @@ -139,9 +133,8 @@ %{_kde4_libdir}/libpayeeidentifier_*.so.* %{_kde4_modulesdir}/kcm_kmm_*.so %{_kde4_modulesdir}/kmm_*.so -%{_kde4_modulesdir}/konlinetasks_*.so +%{_kde4_modulesdir}/konlinetasks_sepa.so %{_kde4_modulesdir}/payeeidentifier_*.so -%{_kde4_servicesdir}/ibanbicdata/ %{_kde4_servicesdir}/kcm_kmm_*.desktop %{_kde4_servicesdir}/kmm_*.desktop %{_kde4_servicesdir}/kmymoney-*.desktop ++++++ aqbanking-5.1-backward-compatibility.patch ++++++ --- /var/tmp/diff_new_pack.OuwGVp/_old 2018-01-19 11:51:44.679791224 +0100 +++ /var/tmp/diff_new_pack.OuwGVp/_new 2018-01-19 11:51:44.679791224 +0100 @@ -1,6 +1,6 @@ -From 245109ca0f045d5acba58d84862f343c1f597f13 Mon Sep 17 00:00:00 2001 +From 84c44ddf367dd88bfa617e28a7fa70f02352393f Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> -Date: Wed, 7 Jun 2017 11:07:36 +0200 +Date: Wed, 27 Dec 2017 08:46:08 +0100 Subject: [PATCH] Add back compatibility with older aqbanking and gwenhywfar This makes it possible to enable/build the kbanking plugin with the old @@ -15,16 +15,16 @@ cmake/modules/FindAqBanking.cmake | 35 ++++++++++++++++++++++ cmake/modules/FindGwenhywfar.cmake | 44 ++++++++++++++++++++++++++++ kmymoney/plugins/kbanking/CMakeLists.txt | 7 +---- - kmymoney/plugins/kbanking/mymoneybanking.cpp | 26 +++++++++++++++- - 5 files changed, 108 insertions(+), 12 deletions(-) + kmymoney/plugins/kbanking/mymoneybanking.cpp | 16 ++++++++++ + 5 files changed, 99 insertions(+), 11 deletions(-) create mode 100644 cmake/modules/FindAqBanking.cmake create mode 100644 cmake/modules/FindGwenhywfar.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt -index 526ffc18..f75b6963 100644 +index 535cf2da..eed1ac5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -175,13 +175,11 @@ if(DEFINED ENABLE_KBANKING) +@@ -200,13 +200,11 @@ if(DEFINED ENABLE_KBANKING) endif(DEFINED ENABLE_KBANKING) option(ENABLE_KBANKING "Enable KBanking plugin" ON) if(ENABLE_KBANKING) @@ -158,7 +158,7 @@ ${LIBALKIMIA_LIBRARIES} ) diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp b/kmymoney/plugins/kbanking/mymoneybanking.cpp -index 4dc2e8e2..b4d8cbc4 100644 +index a64eaf61..202f6bd2 100644 --- a/kmymoney/plugins/kbanking/mymoneybanking.cpp +++ b/kmymoney/plugins/kbanking/mymoneybanking.cpp @@ -90,6 +90,11 @@ @@ -173,21 +173,7 @@ K_PLUGIN_FACTORY(KBankingFactory, registerPlugin<KBankingPlugin>();) K_EXPORT_PLUGIN(KBankingFactory("kmm_kbanking")) -@@ -672,8 +677,12 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas - QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSingleTransfer_new(abAcc)); - if (AB_Job_CheckAvailability(abJob.data()) != 0) - return IonlineTaskSettings::ptr(); -- -+// adapted from http://code.gnucash.org/docs/MASTER/dialog-ab-trans_8c_source.html -+#ifdef AQBANKING_VERSION_GREATER_5_2_0 - const AB_TRANSACTION_LIMITS* limits = AB_Job_GetFieldLimits(abJob.data()); -+#else -+ const AB_TRANSACTION_LIMITS* limits = AB_JobSingleTransfer_GetFieldLimits(abJob.data()); -+#endif - return AB_TransactionLimits_toGermanOnlineTaskSettings(limits).dynamicCast<IonlineTaskSettings>(); - //! @todo needs free? because that is not possible with const AB_TRANSACTION_LIMITS* - // AB_TransactionLimits_free( limits ); -@@ -682,7 +691,12 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas +@@ -681,7 +686,12 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSepaTransfer_new(abAcc)); if (AB_Job_CheckAvailability(abJob.data()) != 0) return IonlineTaskSettings::ptr(); @@ -200,21 +186,7 @@ return AB_TransactionLimits_toSepaOnlineTaskSettings(limits).dynamicCast<IonlineTaskSettings>(); } return IonlineTaskSettings::ptr(); -@@ -734,7 +748,13 @@ bool KBankingPlugin::enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job) - AB_Transaction_SetValue(abTransaction, AB_Value_fromMyMoneyMoney(job.task()->value())); - - /** @todo LOW remove Debug info */ -+// following the gnucash code, aqbanking prior 5.2 does support -+// identical functions, but per transaction type (sepa, debitnote, ...). -+#ifdef AQBANKING_VERSION_GREATER_5_2_0 - qDebug() << "SetTransaction: " << AB_Job_SetTransaction(abJob, abTransaction); -+#else -+ qDebug() << "SetTransaction: " << AB_JobSingleTransfer_SetTransaction(abJob, abTransaction); -+#endif - - GWEN_DB_NODE *gwenNode = AB_Job_GetAppData(abJob); - GWEN_DB_SetCharValue(gwenNode, GWEN_DB_FLAGS_DEFAULT, "kmmOnlineJobId", m_kbanking->mappingId(job).toLatin1().constData()); -@@ -797,7 +817,13 @@ bool KBankingPlugin::enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job) +@@ -740,7 +750,13 @@ bool KBankingPlugin::enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job) AB_Transaction_SetValue(AbTransaction, AB_Value_fromMyMoneyMoney(job.constTask()->value())); /** @todo LOW remove Debug info */ @@ -229,5 +201,5 @@ GWEN_DB_NODE *gwenNode = AB_Job_GetAppData(abJob); GWEN_DB_SetCharValue(gwenNode, GWEN_DB_FLAGS_DEFAULT, "kmmOnlineJobId", m_kbanking->mappingId(job).toLatin1().constData()); -- -2.12.3 +2.13.6 ++++++ fix-sepa-plugin.patch ++++++ >From 8a4292268c2d88cdf757b4c162315360901139c5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Fri, 29 Dec 2017 21:09:36 +0100 Subject: Fix SEPA plugin installation Summary: add_library() may add a "lib" prefix to the plugin's filename, which causes it not to be found. Using kde4_add_plugin() instead again fixes that. This change to add_library() was (accidentally?) backported from the KF5 version in commit c78183f18201 . BUG: 386547 FIXED-IN: 4.8.2 Intended for the 4.8 branch only, of course. Test Plan: The plugin is again installed as konlinetasks_sepa.so here (like in 4.8.0, and also the KF5 port). The error message that the plugin could not be found does not occur anymore, kmymoney prints > onlineTask available "org.kmymoney.creditTransfer.sepa" to stdout now. Haven't tested the actual functionality though. Reviewers: #kmymoney, habacker Reviewed By: #kmymoney, habacker Subscribers: tbaumgart Tags: #kmymoney Differential Revision: https://phabricator.kde.org/D9545 --- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt index e3962d7..031820e 100644 --- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt +++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS ui/sepacredittransferedit.ui ) -add_library(konlinetasks_sepa MODULE +kde4_add_plugin(konlinetasks_sepa ${sepaOnlineTasks_SRCS} ) -- cgit v0.11.2 ++++++ kmymoney-4.8.0.tar.xz -> kmymoney-4.8.1.1.tar.xz ++++++ /work/SRC/openSUSE:Factory/kmymoney/kmymoney-4.8.0.tar.xz /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney-4.8.1.1.tar.xz differ: char 17, line 1
