From dcc1facc3e76155d196c0f04eb379e684ce7e3e1 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 09:10:11 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .xxhash.metadata | 2 +- SOURCES/1-fix-man-page-installation.patch | 129 ---------------------- SPECS/xxhash.spec | 26 +++-- 4 files changed, 16 insertions(+), 143 deletions(-) delete mode 100644 SOURCES/1-fix-man-page-installation.patch diff --git a/.gitignore b/.gitignore index 387aca5..2c465fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xxhash-0.8.1.tar.gz +SOURCES/xxhash-0.8.2.tar.gz diff --git a/.xxhash.metadata b/.xxhash.metadata index 21a64f7..5768ed7 100644 --- a/.xxhash.metadata +++ b/.xxhash.metadata @@ -1 +1 @@ -a92c9a9cfbef23e52f2d1b581cb9926c680d261d SOURCES/xxhash-0.8.1.tar.gz +8df702581ebc48a5e05be0f1ede6e1e9139e4da1 SOURCES/xxhash-0.8.2.tar.gz diff --git a/SOURCES/1-fix-man-page-installation.patch b/SOURCES/1-fix-man-page-installation.patch deleted file mode 100644 index 3cb485b..0000000 --- a/SOURCES/1-fix-man-page-installation.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 836f4e735cf368542f14005e41d2f84ec29dfd60 Mon Sep 17 00:00:00 2001 -From: Yann Collet -Date: Sat, 4 Dec 2021 10:29:49 -0800 -Subject: [PATCH] fix man page installation - -for variant redirectors (`xxh32sum`, `xxh64sum` and `xxh128sum`). -fix #647, reported by @jpalus. - -Also : slightly updated man page text, for clarity and accuracy. ---- - Makefile | 14 ++++++++------ - cli/xxhsum.1 | 8 ++++---- - cli/xxhsum.1.md | 8 +++++--- - 3 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/Makefile b/Makefile -index 2fbefbc..63273e1 100644 ---- a/Makefile -+++ b/Makefile -@@ -457,6 +457,7 @@ endif - - INSTALL_PROGRAM ?= $(INSTALL) - INSTALL_DATA ?= $(INSTALL) -m 644 -+INSTALL_DIR ?= $(INSTALL) -d -m 755 - - - # Escape special symbols by putting each character into its separate class -@@ -496,7 +497,7 @@ libxxhash.pc: libxxhash.pc.in - .PHONY: install - install: lib libxxhash.pc xxhsum ## install libraries, CLI, links and man page - @echo Installing libxxhash -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(LIBDIR) -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_DATA) libxxhash.a $(DESTDIR)$(LIBDIR) - $(Q)$(INSTALL_PROGRAM) $(LIBXXH) $(DESTDIR)$(LIBDIR) - $(Q)ln -sf $(LIBXXH) $(DESTDIR)$(LIBDIR)/libxxhash.$(SHARED_EXT_MAJOR) -@@ -508,19 +509,20 @@ ifeq ($(DISPATCH),1) - $(Q)$(INSTALL_DATA) xxh_x86dispatch.h $(DESTDIR)$(INCLUDEDIR) - endif - @echo Installing pkgconfig -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(PKGCONFIGDIR)/ -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGCONFIGDIR)/ - $(Q)$(INSTALL_DATA) libxxhash.pc $(DESTDIR)$(PKGCONFIGDIR)/ - @echo Installing xxhsum -- $(Q)$(INSTALL) -d -m 755 $(DESTDIR)$(BINDIR)/ $(DESTDIR)$(MANDIR)/ -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(BINDIR)/ - $(Q)$(INSTALL_PROGRAM) xxhsum $(DESTDIR)$(BINDIR)/xxhsum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh32sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh64sum - $(Q)ln -sf xxhsum $(DESTDIR)$(BINDIR)/xxh128sum - @echo Installing man pages -+ $(Q)$(INSTALL_DIR) $(DESTDIR)$(MANDIR)/ - $(Q)$(INSTALL_DATA) $(MAN) $(DESTDIR)$(MANDIR)/xxhsum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh32sum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh64sum.1 -- $(Q)ln -sf $(MAN) $(DESTDIR)$(MANDIR)/xxh128sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh32sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh64sum.1 -+ $(Q)ln -sf xxhsum.1 $(DESTDIR)$(MANDIR)/xxh128sum.1 - @echo xxhash installation completed - - .PHONY: uninstall -diff --git a/cli/xxhsum.1 b/cli/xxhsum.1 -index 27e6808..715fc4b 100644 ---- a/cli/xxhsum.1 -+++ b/cli/xxhsum.1 -@@ -1,14 +1,14 @@ --.TH "XXHSUM" "1" "November 2021" "xxhsum 0.8.1" "User Commands" -+.TH "XXHSUM" "1" "December 2021" "xxhsum 0.8.1" "User Commands" - .SH "NAME" - \fBxxhsum\fR \- print or check xxHash non\-cryptographic checksums - .SH "SYNOPSIS" - \fBxxhsum [