diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index daf8f14..e5e5cdd 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1576927930 -commit: c4af1772f79e6283d70df22fed5a35c4a874b399e81925511a9e80c2271d269d +mtime: 1730560648 +commit: 16bc2e6b489fa724c2da934da70b44182f0dc70a87965a14c1a33684e665f666 url: https://src.opensuse.org/jengelh/libt3key revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index e20ebb3..8b9503c 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1526cd7369e3d36e828f87f52f1d3cfabafa920e9620150defbbbae1cd570254 +oid sha256:c15f7ed8a5a51bf47b6ddbf120c00bf1d5067546d4f36c0ee5bb7550d24ad09f size 256 diff --git a/libt3key.changes b/libt3key.changes index 0ab4feb..8ad2472 100644 --- a/libt3key.changes +++ b/libt3key.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 2 15:11:49 UTC 2024 - Jan Engelhardt + +- Add ncurses.patch to fix FTBFS with gcc-14 +- Split non-library files from libt3key to restore SLPP conformance + ------------------------------------------------------------------- Thu Dec 19 23:50:58 UTC 2019 - Jan Engelhardt diff --git a/libt3key.spec b/libt3key.spec index 5cf6755..203247d 100644 --- a/libt3key.spec +++ b/libt3key.spec @@ -1,7 +1,7 @@ # # spec file for package libt3key # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,11 +24,11 @@ Summary: The Tilde Toolkit's terminal key sequence database library License: GPL-3.0-only Group: Development/Libraries/C and C++ URL: https://os.ghalkes.nl/t3/libt3key.html - #Git-Clone: https://github.com/gphalkes/t3key Source: https://os.ghalkes.nl/dist/%name-%version.tar.bz2 Source2: https://os.ghalkes.nl/dist/%name-%version.tar.bz2.sig Source3: %name.keyring +Patch1: ncurses.patch BuildRequires: fdupes BuildRequires: gettext-tools BuildRequires: libtool @@ -46,6 +46,7 @@ emulators, to key symbols. %package -n %lname Summary: The Tilde Toolkit's terminal key sequence database library Group: System/Libraries +Requires: %name-data %description -n %lname libt3key is library that provides a database of mappings from escape @@ -65,6 +66,13 @@ emulators, to key symbols. This subpackage contains libraries and header files for developing applications that want to make use of libt3key. +%package data +Summary: Terminal capability descriptions for libt3key +Group: System/Base + +%description data +Terminal capability descriptions for libt3key. + %package utils Summary: Utilities for working with libt3key terminal descriptions Group: System/Base @@ -77,29 +85,29 @@ emulators, to key symbols. This subpackage contains the t3learnkeys and t3keyc programs. %prep -%setup -q +%autosetup -p1 %build export CC=gcc %configure --docdir="%_docdir/%name" -make %{?_smp_mflags} +%make_build %install %make_install rm -f "%buildroot/%_libdir"/*.la +chmod a+x "%buildroot/%_libdir"/*.so* %fdupes %buildroot/%_prefix -%post -p /sbin/ldconfig -n %lname -%postun -p /sbin/ldconfig -n %lname +%ldconfig_scriptlets -n %lname %files -n %lname -%defattr(-,root,root) %_libdir/libt3key.so.1* -%doc COPYING +%license COPYING + +%files data %_datadir/%lname/ %files devel -%defattr(-,root,root) %_includedir/t3/ %_libdir/libt3key.so %_libdir/pkgconfig/libt3key.pc @@ -107,7 +115,6 @@ rm -f "%buildroot/%_libdir"/*.la %exclude %_docdir/%name/COPYING %files utils -%defattr(-,root,root) %_bindir/t3* %_mandir/man1/t3*.1* diff --git a/ncurses.patch b/ncurses.patch new file mode 100644 index 0000000..f673c25 --- /dev/null +++ b/ncurses.patch @@ -0,0 +1,22 @@ +From: Jan Engelhardt +Date: 2024-11-02 16:06:53.256545988 +0100 +References: https://github.com/gphalkes/t3key/pull/2 + +.config.c:8:13: error: implicit declaration of function ‘setupterm’; did you mean ‘set_term’? [-Wimplicit-function-declaration] + +--- + config.pkg | 1 + + 1 file changed, 1 insertion(+) + +Index: libt3key-0.2.10/config.pkg +=================================================================== +--- libt3key-0.2.10.orig/config.pkg ++++ libt3key-0.2.10/config.pkg +@@ -144,6 +144,7 @@ EOF + #include + #include + #include ++#include + + int main(int argc, char *argv[]) { + int args[9], error, fd;