[ledger] Revert upstream commit aa2ff2b5 which caused a regression

[Jamie Nguyen]

commit 34cc2b802228dadd2c6fb15a6d2dbb3be4028a1b
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun May 4 14:08:54 2014 +0100

    Revert upstream commit aa2ff2b5 which caused a regression

 ....0.2-Revert-Improve-error-message-balance.patch |   57 ++++++++++++++++++++
 ledger.spec                                        |   10 +++-
 2 files changed, 65 insertions(+), 2 deletions(-)
---
diff --git a/ledger-3.0.2-Revert-Improve-error-message-balance.patch b/ledger-3.0.2-Revert-Improve-error-message-balance.patch
new file mode 100644
index 0000000..1ab8918
--- /dev/null
+++ b/ledger-3.0.2-Revert-Improve-error-message-balance.patch
@@ -0,0 +1,57 @@
+From 6c9f5fa7b2e5692dac43a5dad19a01196ea12055 Mon Sep 17 00:00:00 2001
+From: Jamie Nguyen <j at jamielinux.com>
+Date: Sun, 4 May 2014 11:31:51 +0100
+Subject: [PATCH] Revert "Improve an error message relating to balance
+ assertions"
+
+This reverts commit aa2ff2b5db4afd28fc05e4cb0848d6cc1f0862e9.
+---
+ src/textual.cc | 11 +++--------
+ 1 file changed, 3 insertions(+), 8 deletions(-)
+
+diff --git a/src/textual.cc b/src/textual.cc
+index 55f22a2..d02e2f7 100644
+--- a/src/textual.cc
++++ b/src/textual.cc
+@@ -1609,25 +1609,22 @@ post_t * instance_t::parse_post(char *          line,
+             "line " << context.linenum << ": " << "post amount = " << amt);
+ 
+       amount_t diff = amt;
+-      amount_t tot;
+ 
+       switch (account_total.type()) {
+       case value_t::AMOUNT:
+-        tot = account_total.as_amount();
++        diff -= account_total.as_amount();
+         break;
+ 
+       case value_t::BALANCE:
+         if (optional<amount_t> comm_bal =
+             account_total.as_balance().commodity_amount(amt.commodity()))
+-          tot = *comm_bal;
++          diff -= *comm_bal;
+         break;
+ 
+       default:
+         break;
+       }
+ 
+-      diff -= tot;
+-
+       DEBUG("post.assign",
+             "line " << context.linenum << ": " << "diff = " << diff);
+       DEBUG("textual.parse", "line " << context.linenum << ": "
+@@ -1637,9 +1634,7 @@ post_t * instance_t::parse_post(char *          line,
+         if (! post->amount.is_null()) {
+           diff -= post->amount;
+           if (! no_assertions && ! diff.is_zero())
+-            throw_(parse_error,
+-                   _f("Balance assertion off by %1% (expected to see %2%)")
+-                   % diff % tot);
++            throw_(parse_error, _f("Balance assertion off by %1%") % diff);
+         } else {
+           post->amount = diff;
+           DEBUG("textual.parse", "line " << context.linenum << ": "
+-- 
+1.9.0
+
diff --git a/ledger.spec b/ledger.spec
index 5944c1d..b5a7b95 100644
--- a/ledger.spec
+++ b/ledger.spec
@@ -2,7 +2,7 @@
 
 Name:             ledger
 Version:          3.0.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          A powerful command-line double-entry accounting system
 Group:            Applications/Productivity
 License:          BSD
@@ -11,9 +11,11 @@ Source0:          https://github.com/ledger/ledger/archive/%{commit}/%{name}-%{v
 
 # This requires boost 1.55 which is not yet available for Fedora.
 Patch0:           %{name}-3.0.2-Revert-Require-the-use-of-C-11.patch
+# Revert aa2ff2b5 which caused a regression.
+Patch1:           %{name}-3.0.2-Revert-Improve-error-message-balance.patch
 # There are @node pointer errors in the documentation that result in a
 # navigation error.
-Patch1:           %{name}-3.0.2-Fix-node-pointer-errors.patch
+Patch2:           %{name}-3.0.2-Fix-node-pointer-errors.patch
 
 BuildRequires:    boost-devel
 BuildRequires:    cmake
@@ -75,6 +77,7 @@ emacs-%{name} instead.
 %setup -q -n %{name}-%{commit}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 
 %build
@@ -148,6 +151,9 @@ fi
 
 
 %changelog
+* Sun May 04 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 3.0.2-3
+- revert upstream commit aa2ff2b5 which caused a regression
+
 * Sun Apr 27 2014 Jamie Nguyen <jamielinux at fedoraproject.org> - 3.0.2-2
 - fix @node pointer errors in Info files resulting in broken navigation