Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
72e2c57f12 | ||
|
|
a8cea44d97 | ||
|
|
17d5fc346b | ||
|
f9cd90dfd3 |
4 changed files with 55 additions and 87 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -2,3 +2,5 @@ TECkit_2_5_1.tar.gz
|
|||
/teckit-2.5.7.tar.gz
|
||||
/teckit-2.5.9.tar.gz
|
||||
/teckit-2.5.9.tar.gz.asc
|
||||
/teckit-2.5.11.tar.gz
|
||||
/teckit-2.5.11.tar.gz.asc
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (teckit-2.5.9.tar.gz) = 3c6f1709a553992cf233b87ddcd341b405c29b5f8839de712a4cdd02fda6de9d6f8763feb09a35e50a12a3d408e8a6ac363bb13ba315ba46e080477cdec7165a
|
||||
SHA512 (teckit-2.5.9.tar.gz.asc) = 1ad136742f9ca5ddcd70ff2964b0b5ed15c4c4e473ffa151fcbd42c53b3aea58e6709b1baa818a771109379d3e8c2d528031e573ce0ef48ce5002ce8aaa3b225
|
||||
SHA512 (teckit-2.5.11.tar.gz) = 9b3bb850cf52ba4d8658a9bab41305df103fc62706524c5602e05a89f02c0c65a35f60bd4bd3cebff3ee989b5a4d6c73afd72e79ee44d6ef7b3f2eb052fde2c1
|
||||
SHA512 (teckit-2.5.11.tar.gz.asc) = 4e4f4794485ff371b333bc442ee234b0d238763526b286373824b6b69886ae2402f35e37ca72ee8060405e54eae03c859942ffe9409f2809f99572a3faf5ac3d
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
From f62b558e1a7403b4a17ed0141c0a799990f27932 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Mon, 12 Aug 2019 13:30:43 +0200
|
||||
Subject: [PATCH] Correct indentation
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
GCC 9.1.1 complains:
|
||||
|
||||
../SFconv/SFconv.cpp:104:5: warning: this 'while' clause does not guard... [-Wmisleading-indentation]
|
||||
104 | while (in != end && !(in.error() || out.error()))
|
||||
| ^~~~~
|
||||
../SFconv/SFconv.cpp:107:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'while'
|
||||
107 | if (in.error() || out.error()) {
|
||||
| ^~
|
||||
|
||||
This patch fixes it.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
SFconv/SFconv.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/SFconv/SFconv.cpp b/SFconv/SFconv.cpp
|
||||
index eeb4490..df6f8a4 100644
|
||||
--- a/SFconv/SFconv.cpp
|
||||
+++ b/SFconv/SFconv.cpp
|
||||
@@ -101,7 +101,7 @@ Utf8ToString(const char* s)
|
||||
utf16::iterator out = buf;
|
||||
utf8::const_iterator in = s,
|
||||
end = s + len;
|
||||
- while (in != end && !(in.error() || out.error()))
|
||||
+ while (in != end && !(in.error() || out.error()))
|
||||
*out++ = *in++;
|
||||
|
||||
if (in.error() || out.error()) {
|
||||
@@ -109,7 +109,7 @@ Utf8ToString(const char* s)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
- ustring ustr(buf, out - buf);
|
||||
+ ustring ustr(buf, out - buf);
|
||||
delete[] buf;
|
||||
return ustr;
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
||||
87
teckit.spec
87
teckit.spec
|
|
@ -1,52 +1,56 @@
|
|||
Name: teckit
|
||||
Version: 2.5.9
|
||||
Release: 8%{?dist}
|
||||
Version: 2.5.11
|
||||
Release: 1%{?dist}
|
||||
Summary: Conversion library and mapping compiler
|
||||
# COPYING: links to license/LICENSING.txt
|
||||
# license/License_CPLv05.txt: CPLv0.5 text
|
||||
# license/License_LGPLv21.txt: LGPLv2 text
|
||||
# license/License_CPLv05.txt: CPL-0.5 text, waiting on an SPDX identifer
|
||||
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>
|
||||
# license/License_LGPLv21.txt: LGPL-2.1 text
|
||||
# license/LICENSING.txt: license declarations
|
||||
# SFconv/UtfCodec.cpp: LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2)
|
||||
# SFconv/UtfCodec.h: LGPLv2+ or GPLv2+ or MPL(?version) (bundled Graphite2)
|
||||
# SFconv/UtfCodec.cpp: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2)
|
||||
# SFconv/UtfCodec.h: LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL(?version) (bundled Graphite2)
|
||||
# <https://github.com/silnrsi/graphite/issues/58>,
|
||||
# graphite2 package uses "MPL"
|
||||
# source/Engine.cpp: LGPLv2+ or CPL
|
||||
# source/TECkit_Format.h: LGPLv2+ or CPL
|
||||
# source/Engine.cpp: LGPL-2.1-or-later OR CPL-0.5-or-later
|
||||
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>
|
||||
# source/TECkit_Format.h: LGPL-2.1-or-later OR CPL-0.5-or-later
|
||||
## Not in any binary package
|
||||
# aclocal.m4: FSFULLR
|
||||
# compile: GPLv2+ with exceptions
|
||||
# config.guess: GPLv3+ with exceptions
|
||||
# config.sub: GPLv3+ with exceptions
|
||||
# configure: FSFUL and GPLv2+ with exceptions
|
||||
# depcomp: GPLv2+ with exceptions
|
||||
# install-sh: MIT
|
||||
# lib/Makefile.in: FSFULLR
|
||||
# ltmain.sh: GPLv2+ with exceptions and GPLv3+ with exceptions and GPLv3+
|
||||
# m4/libtool.m4: FSFULL and FSFULLR and GPLv2+ with exceptions
|
||||
# compile: GPL-2.0-or-later WITH Autoconf-exception-generic
|
||||
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/68>
|
||||
# config.guess: GPL-3.0-or-later WITH Autoconf-exception-generic
|
||||
# config.sub: GPL-3.0-or-later WITH Autoconf-exception-generic
|
||||
# configure: FSFUL AND GPL-2.0-or-later WITH Libtool-exception
|
||||
# depcomp: GPL-2.0-or-later WITH Autoconf-exception-generic
|
||||
# install-sh: X11
|
||||
# lib/Makefile.in: FSFULLRWD
|
||||
# ltmain.sh: GPL-2.0-or-later WITH Libtool-exception AND
|
||||
# GPL-3.0-or-later WITH Libtool-exception AND GPL-3.0-or-later
|
||||
# m4/libtool.m4: FSFULL AND FSFULLR AND GPL-2.0-or-later WITH Libtool-exception
|
||||
# m4/ltoptions.m4: FSFULLR
|
||||
# m4/ltsugar.m4: FSFULLR
|
||||
# m4/ltversion.m4: FSFULLR
|
||||
# m4/lt~obsolete.m4: FSFULLR
|
||||
# Makefile.in: FSFULLR
|
||||
# missing: GPLv2+ with exceptions
|
||||
# test-driver: GPLv2+ with exceptions
|
||||
# test/Makefile.in: FSFULLR
|
||||
# Makefile.in: FSFULLRWD
|
||||
# missing: GPL-2.0-or-later WITH Autoconf-exception-generic
|
||||
# test-driver: GPL-2.0-or-later WITH Autoconf-exception-generic
|
||||
# test/Makefile.in: FSFULLRWD
|
||||
## Unbundled
|
||||
# SFconv/expat/xmlparse/hashtable.c: MPLv1.1 of GPL+ (bundled expat)
|
||||
# SFconv/expat/xmlparse/xmlparse.c: MPLv1.1 of GPL+ (bundled expat)
|
||||
# zlib-1.2.3: zlib (see nonexistent zlib.h, reported to
|
||||
# <https://github.com/silnrsi/teckit/issues/22>)
|
||||
License: (LGPLv2+ or CPL) and (LGPLv2+ or GPLv2+ or MPLv2.0 or MPLv1.1)
|
||||
# SFconv/expat/xmlparse/hashtable.c: MPL-1.1 OR GPL-1.0-or-later (bundled expat)
|
||||
# SFconv/expat/xmlparse/xmlparse.c: MPL-1.1 OR GPL-1.0-or-later (bundled expat)
|
||||
# zlib-1.2.3: "sse copyright notice in zlib.h"
|
||||
# zlib-1.2.3/zlib.h: zlib-acknowledgement
|
||||
#
|
||||
# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving
|
||||
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>.
|
||||
License: (LGPL-2.1-or-later OR CPL-1.0) AND (LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)
|
||||
URL: https://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=teckit
|
||||
Source0: https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz
|
||||
Source1: https://github.com/silnrsi/teckit/releases/download/v%{version}/teckit-%{version}.tar.gz.asc
|
||||
# Exported from ppisar's keyring
|
||||
Source2: gpgkey-15D41BC02EB807D405EFFAF6C9183BEA0288CDEE.gpg
|
||||
# Fix a compiler warning about a misindentation,
|
||||
# <https://github.com/silnrsi/teckit/pull/23>
|
||||
Patch0: teckit-2.5.9-Correct-indentation.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf >= 2.54
|
||||
BuildRequires: automake >= 1.11
|
||||
BuildRequires: coreutils
|
||||
BuildRequires: expat-devel
|
||||
# gcc is not needed, the only source/NormalizationData.c is included into
|
||||
|
|
@ -73,7 +77,9 @@ a human-readable mapping description (a simple text file).
|
|||
|
||||
%package devel
|
||||
Summary: Developmental files for TECkit library
|
||||
License: LGPLv2+ or CPL
|
||||
# TODO: Augment CPL-1.0 to CPL-0.5-or-later after resolving
|
||||
# <https://gitlab.com/fedora/legal/fedora-license-data/-/issues/160>.
|
||||
License: LGPL-2.1-or-later OR CPL-1.0
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
|
|
@ -82,14 +88,13 @@ that use TECkit, a character encoding and mapping, library.
|
|||
|
||||
%prep
|
||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%autosetup -p1
|
||||
# Remove bundled libraries
|
||||
rm -r zlib-*/*.c SFconv/expat
|
||||
# Regenerate build script
|
||||
autoreconf -fi
|
||||
|
||||
%build
|
||||
# Regenerate a build script
|
||||
autoreconf -fi
|
||||
%configure \
|
||||
--disable-debug \
|
||||
--disable-final \
|
||||
|
|
@ -131,6 +136,16 @@ rm -f %{buildroot}%{_libdir}/*.la
|
|||
%{_libdir}/pkgconfig/teckit.pc
|
||||
|
||||
%changelog
|
||||
* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.11-1
|
||||
- 2.5.11 bump
|
||||
|
||||
* Mon Feb 20 2023 Petr Pisar <ppisar@redhat.com> - 2.5.9-10
|
||||
- Correct a license tag to "(LGPL-2.1-or-later OR CPL-1.0) AND
|
||||
(LGPL-2.1-or-later OR GPL-2.0-or-later OR MPL-2.0 OR MPL-1.1)"
|
||||
|
||||
* Sat Feb 18 2023 Than Ngo <than@redhat.com> - 2.5.9-9
|
||||
- migrated to SPDX license
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.9-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue