From d5457bbe87bfa4d90cff4a752636ab7684ad6cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 21 Oct 2021 14:15:55 +0200 Subject: [PATCH] CVS snapshot taken on 2021-10-21 --- .gitignore | 1 + libecb-20200430-fix_pod.patch | 16 --------- libecb-20211021-Correct-closing-C.patch | 47 +++++++++++++++++++++++++ libecb.rpmlintrc | 3 +- libecb.spec | 15 ++++---- sources | 2 +- 6 files changed, 59 insertions(+), 25 deletions(-) delete mode 100644 libecb-20200430-fix_pod.patch create mode 100644 libecb-20211021-Correct-closing-C.patch diff --git a/.gitignore b/.gitignore index 892c58a..e6344fd 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /libecb-20181119.tar.xz /libecb-20190722.tar.xz /libecb-20200430.tar.xz +/libecb-20211021.tar.xz diff --git a/libecb-20200430-fix_pod.patch b/libecb-20200430-fix_pod.patch deleted file mode 100644 index 36f8c4d..0000000 --- a/libecb-20200430-fix_pod.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: ecb.pod -=================================================================== -RCS file: /schmorpforge/libecb/ecb.pod,v -retrieving revision 1.85 -diff -u -r1.85 ecb.pod ---- ecb.pod 20 Jan 2020 21:13:38 -0000 1.85 -+++ ecb.pod 30 Apr 2020 07:18:17 -0000 -@@ -791,6 +791,8 @@ - - =item T ecb_host_to_le (T v) - -+=back -+ - These functions work like their C counterparts, above, but use templates, - which make them useful in generic code. - diff --git a/libecb-20211021-Correct-closing-C.patch b/libecb-20211021-Correct-closing-C.patch new file mode 100644 index 0000000..786ec89 --- /dev/null +++ b/libecb-20211021-Correct-closing-C.patch @@ -0,0 +1,47 @@ +From 94fef8b2b912e8ce96f207e646a7e2a2c9c3aec4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 21 Oct 2021 14:20:02 +0200 +Subject: [PATCH] Correct closing C<<>> +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař +--- + ecb.pod | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ecb.pod b/ecb.pod +index 9e76c86..d07e995 100644 +--- a/ecb.pod ++++ b/ecb.pod +@@ -1093,7 +1093,7 @@ Example: convert an IP address in an u32 into dotted-quad: + + =item char *ecb_i2a_09 (char *ptr, uint32_t value) // 64 bit + +-The C<< ecb_i2a_0I > functions take an unsigned I and convert ++The C<< ecb_i2a_0I >> functions take an unsigned I and convert + them to exactly I digits, returning a pointer to the first character + after the digits. The I must be in range. The functions marked with + I<32 bit> do their calculations internally in 32 bit, the ones marked with +@@ -1117,7 +1117,7 @@ C). + + =item char *ecb_i2a_9 (char *ptr, uint32_t value) // 64 bit + +-Similarly, the C<< ecb_i2a_I > functions take an unsigned I ++Similarly, the C<< ecb_i2a_I >> functions take an unsigned I + and convert them to at most I digits, suppressing leading zeroes, and + returning a pointer to the first character after the digits. + +@@ -1129,7 +1129,7 @@ returning a pointer to the first character after the digits. + + =item char *ecb_i2a_x10 (char *ptr, uint32_t value) // 64 bit + +-The C<< ecb_i2a_xI >> functions are similar to the C<< ecb_i2a_I > ++The C<< ecb_i2a_xI >> functions are similar to the C<< ecb_i2a_I >> + functions, but they can generate one digit more, as long as the number + is within range, which is given by the symbols C (almost + 16 bit range) and C (a bit more than 31 bit range), +-- +2.31.1 + diff --git a/libecb.rpmlintrc b/libecb.rpmlintrc index b7c3249..8e0eac4 100644 --- a/libecb.rpmlintrc +++ b/libecb.rpmlintrc @@ -1,2 +1 @@ -from Config import * -addFilter("spelling-error .* (devel|noinline|popcount|prefetch)"); +addFilter('spelling-error .* (devel|noinline|popcount|prefetch)') diff --git a/libecb.spec b/libecb.spec index 15da6ab..e248f01 100644 --- a/libecb.spec +++ b/libecb.spec @@ -1,16 +1,16 @@ -%global snapshot 20200430 +%global snapshot 20211021 # Do not create debuginfo sub-package because there is no binary executable %global debug_package %{nil} Name: libecb Version: 0.%{snapshot} -Release: 4%{?dist} +Release: 1%{?dist} Summary: Compiler built-ins License: BSD or GPLv2+ URL: http://software.schmorp.de/pkg/libecb.html # Snapshot from CVS :pserver:anonymous@cvs.schmorp.de/schmorpforge libecb Source0: %{name}-%{snapshot}.tar.xz -# Fix POD syntax, mailed to the author -Patch0: libecb-20200430-fix_pod.patch +# Correct POD syntax, mailed to the upstream +Patch0: libecb-20211021-Correct-closing-C.patch BuildRequires: coreutils BuildRequires: perl-podlators @@ -39,8 +39,7 @@ generally useful low-level functions, such as popcount, expect, prefetch, noinline, assume, unreachable and so on. %prep -%setup -q -n %{name}-%{snapshot} -%patch0 -p0 +%autosetup -p1 -n %{name}-%{snapshot} %build pod2man ecb.pod > ecb.3 @@ -58,6 +57,10 @@ install -m 0644 -t %{buildroot}%{_mandir}/man3 *.3 %{_mandir}/man3/* %changelog +* Thu Oct 21 2021 Petr Pisar - 0.20211021-1 +- CVS snapshot taken on 2021-10-21 (added ECB_64BIT_NATIVE, ecb_i2a, + ecb_ptrmix) + * Thu Jul 22 2021 Fedora Release Engineering - 0.20200430-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c41d4d2..028f379 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libecb-20200430.tar.xz) = eccccd2b57c080ea520852b7c8a2205bdd805d6008bed1c13d4c8eacdb23d52fde158a4e39bce742fa425464fde707e6983e079c9c3f3fedf090e5a60322745e +SHA512 (libecb-20211021.tar.xz) = 61bc8fd4412e0ebfd9a4d8a490da55859f4e5fcd8054b0894c2cb975607eef8e541fb8b273c9c7a405516f03a848a1490480fa1194b36fa81d4d61da3ff31c48