.gitignore

@@ -4,4 +4,3 @@ ledger-2.6.3.tar.gz
 /ledger-3.1.1.tar.gz
 /ledger-49b07a1.tar.gz
 /ledger-2ca3d69.tar.gz
-/v3.2.1.tar.gz

ledger-boost176.patch

@@ -1,41 +0,0 @@
-From e60717ccd78077fe4635315cb2657d1a7f539fca Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 14 Jun 2021 12:37:58 +0000
-Subject: [PATCH] Fix compilation with Boost 1.76
-
-We were previously relying on an indirect include within Boost headers. We're
-using scoped_ptr which is defined in <boost/smart_ptr/scoped_ptr.hpp>.
-
-Bug: https://bugs.gentoo.org/790176
-Closes: https://github.com/ledger/ledger/issues/2030
----
- src/expr.cc  | 2 ++
- src/format.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/src/expr.cc b/src/expr.cc
-index c8945d3da..c19bba98a 100644
---- a/src/expr.cc
-+++ b/src/expr.cc
-@@ -35,6 +35,8 @@
- #include "parser.h"
- #include "scope.h"
- 
-+#include <boost/smart_ptr/scoped_ptr.hpp>
-+
- namespace ledger {
- 
- expr_t::expr_t() : base_type()
-diff --git a/src/format.h b/src/format.h
-index 15431cf11..48c690bec 100644
---- a/src/format.h
-+++ b/src/format.h
-@@ -45,6 +45,8 @@
- #include "expr.h"
- #include "unistring.h"
- 
-+#include <boost/smart_ptr/scoped_ptr.hpp>
-+
- namespace ledger {
- 
- class unistring;

ledger.spec

@@ -1,14 +1,15 @@
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
+%global commit 2ca3d6992ffb4a3546a0451808bd9bd2969c82ff
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name:             ledger
-Version:          3.2.1
-Release:          13%{?dist}
+Version:          3.1.3
+Release:          1.20191030git2ca3d69%{?dist}
 Summary:          A powerful command-line double-entry accounting system
 License:          BSD
 URL:              http://ledger-cli.org/
-Source0:          https://github.com/ledger/ledger/archive/v%{version}.tar.gz
-# https://github.com/ledger/ledger/pull/2036
-Patch0:           ledger-boost176.patch
+Source0:          https://github.com/ledger/ledger/archive/%{commit}/%{name}-%{shortcommit}.tar.gz
 
 BuildRequires:    boost-devel
 BuildRequires:    cmake
@@ -46,7 +47,7 @@ Requires: %{name} = %{version}-%{release}
 Libraries and header files for %{name} development.
 
 %prep
-%autosetup -n %{name}-%{version} -p 1
+%autosetup -n %{name}-%{commit}
 # Avoid texinfo errors on EL7.
 %if 0%{?rhel} == 7
 sed -i -e 's#FIXME:UNDOCUMENTED#FIXMEUNDOCUMENTED#g' doc/ledger3.texi
@@ -55,18 +56,24 @@ rm -r lib/utfcpp
 
 
 %build
-%cmake \
+%cmake . \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DCMAKE_SKIP_RPATH:BOOL=ON \
        -DUSE_PYTHON:BOOL=OFF \
        -DUSE_DOXYGEN:BOOL=ON \
        -DBUILD_WEB_DOCS:BOOL=ON
 
-%cmake_build
-%cmake_build -t doc
+%make_build
+%__make doc
+
+# Build info files.
+pushd doc
+makeinfo ledger3.texi
+popd
+
 
 %install
-%cmake_install
+%make_install
 
 # Bash completion
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
@@ -78,29 +85,29 @@ rm -rf %{buildroot}%{_docdir}
 rm -rf %{buildroot}%{_infodir}/*
 
 # Info files
-cp -p %{__cmake_builddir}/doc/ledger3.info* %{buildroot}%{_infodir}
+cp -p doc/ledger3.info* %{buildroot}%{_infodir}
 
 # Contrib scripts
 mkdir -p %{buildroot}%{_pkgdocdir}/contrib
-for i in bal bal-huquq compilation-ledger.el entry getquote.pl getquote-uk.py ledger-du README repl.sh report tc ti to trend; do
+for i in bal bal-huquq entry getquote.pl getquote-uk.py ledger-du ParseCcStmt.cs README repl.sh report tc ti to trend; do
     install -p -m0644 contrib/${i} %{buildroot}%{_pkgdocdir}/contrib/${i}
 done
 
 # Input samples
 mkdir -p %{buildroot}%{_pkgdocdir}/samples
-for i in demo.ledger divzero.dat drewr3.dat drewr.dat sample.dat standard.dat transfer.dat wow.dat; do
+for i in demo.ledger drewr3.dat drewr.dat sample.dat wow.dat; do
     install -p -m0644 test/input/${i} %{buildroot}%{_pkgdocdir}/samples/${i}
 done
 
 # Tests are disabled for the time being since they seem to require Python 2
 #%%check
 # Tests all fail when removing rpath.
-#LD_LIBRARY_PATH=$PWD %%ctest
+#LD_LIBRARY_PATH=$PWD %__make check
 
 %files
 %doc README.md doc/GLOSSARY.md doc/NEWS.md
-%doc %{__cmake_builddir}/doc/ledger3.html
-%doc %{__cmake_builddir}/doc/ledger3.pdf
+%doc doc/ledger3.html
+%doc doc/ledger3.pdf
 # https://bugzilla.redhat.com/show_bug.cgi?id=728959
 # These must be explicitly listed.
 %doc %{_pkgdocdir}/contrib
@@ -118,59 +125,6 @@ done
 
 
 %changelog
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-12
-- Rebuilt for Boost 1.81
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 3.2.1-9
-- Rebuilt for Boost 1.78
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Aug 09 2021 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-7
-- Patched and rebuilt for Boost 1.76
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu May 20 2021 Pete Walter <pwalter@fedoraproject.org> - 3.2.1-4
-- Rebuild for ICU 69
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 3.2.1-2
-- Rebuilt for Boost 1.75
-
-* Sat Aug 01 2020 Jani Juhani Sinervo <jani@sinervo.fi> - 3.2.1-1
-- Update to newest stable upstream version
-- Fix build on Rawhide
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-6.20191030git2ca3d69
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-5.20191030git2ca3d69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu May 28 2020 Jonathan Wakely <jwakely@redhat.com> - 3.1.3-4.20191030git2ca3d69
-- Rebuilt for Boost 1.73
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.3-3.20191030git2ca3d69
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 3.1.3-2.20191030git2ca3d69
-- Rebuild for ICU 65
-
 * Wed Oct 30 2019 Jani Juhani Sinervo <jani@sinervo.fi> - 3.1.3-1.20191030git2ca3d69
 - Update docs
 - Remove python 2 dependence

sources

@@ -1 +1 @@
-SHA512 (v3.2.1.tar.gz) = 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
+SHA512 (ledger-2ca3d69.tar.gz) = c09535ee7be34f5eb3eb682a4429e9c51a4b99ca8fb4a1603773ebbccdc96a2e694e6a1ea30a9f08a25020ba37358c96682384e78d34dc880402fa669c42073d