diff --git a/0001-Fix-install-gmo-target-to-recompile-gmo-files-only-i.patch b/0001-Fix-install-gmo-target-to-recompile-gmo-files-only-i.patch deleted file mode 100644 index 1b5c184..0000000 --- a/0001-Fix-install-gmo-target-to-recompile-gmo-files-only-i.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9e4eeb1268149b24b7fbe0fc0fe91e3a266e6261 Mon Sep 17 00:00:00 2001 -From: Aleksey -Date: Sun, 31 Oct 2021 02:49:04 +0300 -Subject: [PATCH] Fix install-gmo target to recompile gmo files only if needed - ---- - Makefile | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 6031e43..c127379 100644 ---- a/Makefile -+++ b/Makefile -@@ -293,7 +293,7 @@ clean-bindings: - - clean-local: - rm -f *.o $(RHASH_SHARED) $(RHASH_STATIC) -- rm -f po/*.gmo po/*.po~ -+ rm -f po/*.gmo po/*.po~ po/compile-gmo.tag - - distclean: clean-local - rm -f config.log config.mak $(SPECFILE) $(LIBRHASH_PC) -@@ -309,11 +309,14 @@ update-po: - msgmerge -U $$f po/rhash.pot; \ - done - --compile-gmo: -+po/compile-gmo.tag: $(I18N_FILES) - for f in $(I18N_FILES); do \ - g=`basename $$f .po`; \ - msgfmt -o po/$$g.gmo $$f; \ - done -+ touch $@ -+ -+compile-gmo: po/compile-gmo.tag - - install-gmo: compile-gmo - for f in $(I18N_FILES); do \ --- -2.33.0 - diff --git a/0001-fix-incorrect-total-message-in-check-embedded-mode.patch b/0001-fix-incorrect-total-message-in-check-embedded-mode.patch deleted file mode 100644 index 46c47f3..0000000 --- a/0001-fix-incorrect-total-message-in-check-embedded-mode.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5796c94b1eba4fb7407868555e630b409340b78e Mon Sep 17 00:00:00 2001 -From: Aleksey -Date: Sat, 11 Sep 2021 21:23:34 +0300 -Subject: [PATCH] fix incorrect total message in check-embedded mode - ---- - hash_check.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hash_check.c b/hash_check.c -index 0c0ed84..0ed88ce 100644 ---- a/hash_check.c -+++ b/hash_check.c -@@ -1147,7 +1147,7 @@ static int check_embedded_crc32(file_t* file) - log_error_file_t(&rhash_data.out_file); - res = -2; - } else if (!rhash_data.stop_flags) { -- if (res >= 0) -+ if (res == 0) - rhash_data.ok++; - else if (res == -1 && errno == ENOENT) - rhash_data.miss++; --- -2.33.0 - diff --git a/rhash-1.4.2.tar.gz b/rhash-1.4.2.tar.gz deleted file mode 100644 index e78ff6e..0000000 Binary files a/rhash-1.4.2.tar.gz and /dev/null differ diff --git a/rhash-1.4.4.tar.gz b/rhash-1.4.4.tar.gz new file mode 100644 index 0000000..b2ad0af Binary files /dev/null and b/rhash-1.4.4.tar.gz differ diff --git a/rhash.spec b/rhash.spec index 36fb2b3..04b6c08 100644 --- a/rhash.spec +++ b/rhash.spec @@ -1,13 +1,11 @@ Name: rhash -Version: 1.4.2 -Release: 3 +Version: 1.4.4 +Release: 1 Summary: Great utility for computing hash sums License: MIT URL: https://github.com/rhash/RHash Source0: https://github.com/rhash/RHash/archive/v%{version}/rhash-%{version}.tar.gz -Patch1: 0001-fix-incorrect-total-message-in-check-embedded-mode.patch -Patch2: 0001-Fix-install-gmo-target-to-recompile-gmo-files-only-i.patch BuildRequires: gcc %description @@ -33,11 +31,10 @@ Documentation for rhash %prep %autosetup -n RHash-%{version} -sed -i -e '/^INSTALL_SHARED/s/644/755/' librhash/Makefile %build ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sysconfdir=%{_sysconfdir} --libdir=%{_libdir} --mandir=%{_mandir} --enable-lib-shared --enable-gettext -%make_build OPTFLAGS="%{optflags}" OPTLDFLAGS="-g %{?__global_ldflags}" build-shared +%make_build OPTFLAGS="%{optflags}" OPTLDFLAGS="-g %{?__global_ldflags}" %install %make_install @@ -65,6 +62,9 @@ make test-shared %{_mandir}/man1/*.1* %changelog +* Wed Oct 11 2023 wangkai <13474090681@163.com> - 1.4.4-1 +- Update to 1.4.4 + * Fri Jan 6 2023 caofei - 1.4.2-3 - Fix install-gmo target to recompile gmo files only if needed