diff --git a/10e9ac86df9a823d7470deaaa50c44d2857ee6f7.tar.gz b/10e9ac86df9a823d7470deaaa50c44d2857ee6f7.tar.gz new file mode 100644 index 0000000..75b614e --- /dev/null +++ b/10e9ac86df9a823d7470deaaa50c44d2857ee6f7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb62e76b7de9f4445697c2bb3d420009f007d8dbf2261af9846c29d2aca2ff5f +size 67707 diff --git a/bmwiedemann-sort.patch b/bmwiedemann-sort.patch new file mode 100644 index 0000000..19bb0ad --- /dev/null +++ b/bmwiedemann-sort.patch @@ -0,0 +1,26 @@ +From e2e366c0b3d0d2e50bfe6908d61785f6ee321a5c Mon Sep 17 00:00:00 2001 +From: "Bernhard M. Wiedemann" +Date: Fri, 18 Mar 2022 19:51:22 +0100 +Subject: [PATCH] Sort input file list + +so that `epub2txt` builds in a reproducible way +in spite of indeterministic filesystem readdir order + +See https://reproducible-builds.org/ for why this is good. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 2013cf1..449be7f 100644 +--- a/Makefile ++++ b/Makefile +@@ -9,7 +9,7 @@ MANDIR := /share/man + APPNAME := epub2txt + + TARGET := epub2txt +-SOURCES := $(shell find src/ -type f -name *.c) ++SOURCES := $(sort $(shell find src/ -type f -name *.c)) + OBJECTS := $(patsubst src/%,build/%,$(SOURCES:.c=.o)) + DEPS := $(OBJECTS:.o=.deps) + diff --git a/epub2txt2.changes b/epub2txt2.changes index 43b99fd..37036ed 100644 --- a/epub2txt2.changes +++ b/epub2txt2.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Mar 30 00:04:30 UTC 2022 - Soc Virnyl Estela + +- replace %{version} to a custom %{_commit_hash} to fix build errors + +------------------------------------------------------------------- +Tue Mar 29 23:58:55 UTC 2022 - Soc Virnyl Estela + +- Use the commit hash instead. Upstream maintainer didn't tagged a release + and only changed the README that it is version 2.03. This is to clarify + that commit `10e9ac86df9a823d7470deaaa50c44d2857ee6f7` is 2.03. + +------------------------------------------------------------------- +Tue Mar 29 12:45:00 UTC 2022 - Soc Virnyl Estela + +- Fix spec and sources. + +------------------------------------------------------------------- +Tue Mar 29 12:20:59 UTC 2022 - Soc Virnyl Estela + +- Update epub2text2 version to 2.03: + * Fixed buffer overrun bug + +- Update patches: + * Add bmwiedemann/sort patch for reproducible builds + * Use `%autopatch -p1` in spec file + +- add bmwiedemann-sort.patch + ------------------------------------------------------------------- Sat Mar 12 23:32:20 UTC 2022 - Soc Virnyl Estela diff --git a/epub2txt2.spec b/epub2txt2.spec index 69cbf56..3f84c2b 100644 --- a/epub2txt2.spec +++ b/epub2txt2.spec @@ -12,29 +12,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%global _commit_hash "10e9ac86df9a823d7470deaaa50c44d2857ee6f7" + Name: epub2txt2 -Version: 2.01 +Version: 2.03 Release: 0 -Summary: Simple command-line utility for extracting text from EPUB documents +Summary: Simple command-line utility for extracting text from EPUB documents License: GPL-3.0-only Group: Productivity/Text/Utilities -Url: https://github.com/kevinboone/epub2txt2 -Source: https://github.com/kevinboone/epub2txt2/archive/v%{version}.tar.gz -Patch: LICENSE.patch -BuildRequires: make +URL: https://github.com/kevinboone/epub2txt2 +Source0: https://github.com/kevinboone/epub2txt2/archive/10e9ac86df9a823d7470deaaa50c44d2857ee6f7.tar.gz +Patch0: LICENSE.patch +Patch1: bmwiedemann-sort.patch BuildRequires: gcc +BuildRequires: make Requires: unzip %description Simple command-line utility for extracting text from EPUB documents %prep -%setup -q -%patch -p1 +%setup -q -n %{name}-%{_commit_hash} +%autopatch -p1 %build %make_build @@ -49,4 +52,3 @@ Simple command-line utility for extracting text from EPUB documents %{_mandir}/man1/epub2txt.1%{?ext_man} %changelog - diff --git a/v2.01.tar.gz b/v2.01.tar.gz deleted file mode 100644 index 559b2eb..0000000 --- a/v2.01.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82c96c713c8a6e10d7b37e96db83a9d5f50fcb4b65034b4a1df1024776b6591f -size 57171