Sync changes to SLFO-1.2 branch

libxkbfile.changes

@@ -1,27 +1,9 @@
 -------------------------------------------------------------------
-Tue Feb 25 17:41:52 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
+Sat Feb 22 11:11:57 UTC 2025 - Stefan Dirsch <sndirsch@suse.com>
 
 - U_CVE-2025-26595-0001-xkb-Fix-buffer-overflow-in-XkbVModMaskText.patch 
   * Buffer overflow in XkbVModMaskText() (CVE-2025-26595, bsc#1237429)
 
--------------------------------------------------------------------
-Mon Feb  5 11:51:49 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>
-
-- update to 1.1.3
-  * configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
-  * Set close-on-exec when opening files
-  * _XkbMakeAtom: remove check for impossible case
-  * _XkbInitAtoms: check for malloc() failure
-  * XkbChangeAtomDisplay: stop leaking atom name
-  * XkbCFReportError: avoid -Wformat-nonliteral warning
-  * XkbWriteCFile: stop leaking header file ifdef name
-  * DefaultParser: avoid -Wimplicit-fallthrough warnings
-  * xkbtext.c: Add tbGetBufferString helper function
-  * XkbIndentText: Fix -Wsign-compare warning
-  * Fix -Wsign-compare warnings in xkbtext.c & xkmread.c
-  * Add a meson build system
--  switched to meson build system
-
 -------------------------------------------------------------------
 Thu Dec  8 20:55:13 UTC 2022 - Dirk Müller <dmueller@suse.com>
 

libxkbfile.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libxkbfile
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %define lname	libxkbfile1
 Name:           libxkbfile
-Version:        1.1.3
+Version:        1.1.2
 Release:        0
 Summary:        X11 keyboard file manipulation library
 License:        MIT
@@ -29,7 +29,9 @@ URL:            https://xorg.freedesktop.org/
 Source:         http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
 Patch1237429:   U_CVE-2025-26595-0001-xkb-Fix-buffer-overflow-in-XkbVModMaskText.patch
-BuildRequires:  meson
+BuildRequires:  autoconf >= 2.60
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(kbproto)
 BuildRequires:  pkgconfig(x11)
@@ -70,11 +72,12 @@ in %{lname}.
 %autosetup -p1
 
 %build
-%meson
-%meson_build
+%configure --disable-static
+%make_build
 
 %install
-%meson_install
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
 
 %post -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig