From 87d53b8b442fdd1b155d84a6a6942303ca0158c81225d4c7114b66ee1d570a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <bjorn.lie@gmail.com>
Date: Mon, 7 Mar 2022 12:34:15 +0000
Subject: [PATCH] Accepting request 959804 from GNOME:Next

- Update to version 5.4:
  + A couple of introspection fixes.
- Update URL, this version was never released on download.gnome.org
- Add explicit libxklavier16 (shared library) Requires in devel
  sub-package (we already pulled it in via virtual provides).
- Use modern macros.

OBS-URL: https://build.opensuse.org/request/show/959804
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libxklavier?expand=0&rev=39
---
 libxklavier-5.3.tar.xz  |  3 ---
 libxklavier-5.4.tar.bz2 |  3 +++
 libxklavier.changes     | 10 ++++++++++
 libxklavier.spec        | 27 +++++++++++++++------------
 4 files changed, 28 insertions(+), 15 deletions(-)
 delete mode 100644 libxklavier-5.3.tar.xz
 create mode 100644 libxklavier-5.4.tar.bz2

diff --git a/libxklavier-5.3.tar.xz b/libxklavier-5.3.tar.xz
deleted file mode 100644
index dab982e..0000000
--- a/libxklavier-5.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404
-size 315684
diff --git a/libxklavier-5.4.tar.bz2 b/libxklavier-5.4.tar.bz2
new file mode 100644
index 0000000..1fd3ba1
--- /dev/null
+++ b/libxklavier-5.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17a34194df5cbcd3b7bfd0f561d95d1f723aa1c87fca56bc2c209514460a9320
+size 390428
diff --git a/libxklavier.changes b/libxklavier.changes
index 82869aa..7954294 100644
--- a/libxklavier.changes
+++ b/libxklavier.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Mar  6 18:42:54 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 5.4:
+  + A couple of introspection fixes.
+- Update URL, this version was never released on download.gnome.org
+- Add explicit libxklavier16 (shared library) Requires in devel
+  sub-package (we already pulled it in via virtual provides).
+- Use modern macros.
+
 -------------------------------------------------------------------
 Mon Mar  5 15:43:03 UTC 2018 - jengelh@inai.de
 
diff --git a/libxklavier.spec b/libxklavier.spec
index 4355324..d2b648a 100644
--- a/libxklavier.spec
+++ b/libxklavier.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libxklavier
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -12,19 +12,21 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           libxklavier
-Version:        5.3
+Version:        5.4
 Release:        0
 Summary:        Library with X keyboard related functions
 License:        LGPL-2.0-or-later
 Group:          Development/Libraries/X11
-Url:            http://www.freedesktop.org/Software/LibXklavier
-Source:         http://download.gnome.org/sources/libxklavier/5.3/%{name}-%{version}.tar.xz
+URL:            http://www.freedesktop.org/Software/LibXklavier
+#Source:         http://download.gnome.org/sources/libxklavier/5.4/%%{name}-%%{version}.tar.xz
+Source:         http://people.freedesktop.org/~svu/libxklavier-5.4.tar.bz2
 Source99:       baselibs.conf
+
 BuildRequires:  doxygen
 BuildRequires:  gobject-introspection-devel >= 1.30
 BuildRequires:  gtk-doc
@@ -45,6 +47,7 @@ Summary:        Development files for libxklavier
 Group:          Development/Libraries/X11
 Requires:       %{name} = %{version}
 Requires:       glibc-devel
+Requires:       libxklavier16 = %{version}
 Requires:       typelib-1_0-Xkl-1_0 = %{version}
 
 %description devel
@@ -80,21 +83,21 @@ Requires:       %{name} = %{version}
 This library allows you to simplify XKB-related development.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %configure \
-        --with-xkb-base=%{_datadir}/X11/xkb \
-        --with-xkb-bin-base=%{_bindir} \
-        --disable-static
-make %{?_smp_mflags}
+	--with-xkb-base=%{_datadir}/X11/xkb \
+	--with-xkb-bin-base=%{_bindir} \
+	--disable-static \
+	%{nil}
+%make_build
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%post -n libxklavier16 -p /sbin/ldconfig
-%postun -n libxklavier16 -p /sbin/ldconfig
+%ldconfig_scriptlets -n libxklavier16
 
 %files -n libxklavier16
 %license COPYING.LIB