Overview

File project.diff of Package 16.0-xkeyboard-config-smarlayout

--- python-3.11.patch.orig
+++ python-3.11.patch
@@ -1,17 +1,18 @@
-diff -u -r -p xkeyboard-config-2.42.orig/meson.build xkeyboard-config-2.42/meson.build
---- xkeyboard-config-2.42.orig/meson.build	2024-12-09 14:33:33.685493000 +0100
-+++ xkeyboard-config-2.42/meson.build	2024-12-09 14:35:09.281509000 +0100
-@@ -77,7 +77,7 @@ endif
- 
- # pytest suite
+Index: xkeyboard-config-2.44/meson.build
+===================================================================
+--- xkeyboard-config-2.44.orig/meson.build
++++ xkeyboard-config-2.44/meson.build
+@@ -64,7 +64,7 @@ endif
+ # If needed, copy our data files over to the build directory
+ # so we can use the builddir as XKB_CONFIG_ROOT
  pymod = import('python')
 -python = pymod.find_installation('python3',
 +python = pymod.find_installation('python3.11',
                                   modules: ['pytest'],
                                   required: false)
  pytest = find_program('pytest-3', 'pytest', required: false)
-@@ -86,7 +86,7 @@ if enable_pytest
-     pytest_args = ['--verbose', '--log-level=DEBUG']
+@@ -120,7 +120,7 @@ if enable_pytest
+     endif
      # use pytest xdist if available, it really speeds up the tests cases
      optional_python_modules = ['xdist']
 -    if pymod.find_installation('python3', modules: optional_python_modules, required: false).found()
@@ -19,54 +20,60 @@ diff -u -r -p xkeyboard-config-2.42.orig
          pytest_args += ['-n', 'auto']
      endif
  
-diff -u -r -p xkeyboard-config-2.42.orig/rules/compat/map-variants.py xkeyboard-config-2.42/rules/compat/map-variants.py
---- xkeyboard-config-2.42.orig/rules/compat/map-variants.py	2024-12-09 14:33:37.968787000 +0100
-+++ xkeyboard-config-2.42/rules/compat/map-variants.py	2024-12-09 14:35:19.598496000 +0100
+Index: xkeyboard-config-2.44/rules/compat/map-variants.py
+===================================================================
+--- xkeyboard-config-2.44.orig/rules/compat/map-variants.py
++++ xkeyboard-config-2.44/rules/compat/map-variants.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/env python3.11
+ # SPDX-License-Identifier: MIT
  
- import argparse
- import re
-diff -u -r -p xkeyboard-config-2.42.orig/rules/generate-options-symbols.py xkeyboard-config-2.42/rules/generate-options-symbols.py
---- xkeyboard-config-2.42.orig/rules/generate-options-symbols.py	2024-12-09 14:33:38.057788000 +0100
-+++ xkeyboard-config-2.42/rules/generate-options-symbols.py	2024-12-09 14:35:24.650708000 +0100
+ from __future__ import annotations
+Index: xkeyboard-config-2.44/rules/generate-options-symbols.py
+===================================================================
+--- xkeyboard-config-2.44.orig/rules/generate-options-symbols.py
++++ xkeyboard-config-2.44/rules/generate-options-symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/env python3.11
  #
  # This file is formatted with python black
  #
-diff -u -r -p xkeyboard-config-2.42.orig/rules/merge.py xkeyboard-config-2.42/rules/merge.py
---- xkeyboard-config-2.42.orig/rules/merge.py	2024-12-09 14:33:38.086824000 +0100
-+++ xkeyboard-config-2.42/rules/merge.py	2024-12-09 14:35:28.163506000 +0100
+Index: xkeyboard-config-2.44/rules/merge.py
+===================================================================
+--- xkeyboard-config-2.44.orig/rules/merge.py
++++ xkeyboard-config-2.44/rules/merge.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/env python3.11
+ # SPDX-License-Identifier: MIT
  
- import argparse
- import sys
-diff -u -r -p xkeyboard-config-2.42.orig/scripts/symbols-tree.py xkeyboard-config-2.42/scripts/symbols-tree.py
---- xkeyboard-config-2.42.orig/scripts/symbols-tree.py	2024-12-09 14:33:38.372760000 +0100
-+++ xkeyboard-config-2.42/scripts/symbols-tree.py	2024-12-09 14:35:31.811319000 +0100
+ from __future__ import annotations
+Index: xkeyboard-config-2.44/scripts/symbols-tree.py
+===================================================================
+--- xkeyboard-config-2.44.orig/scripts/symbols-tree.py
++++ xkeyboard-config-2.44/scripts/symbols-tree.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/env python3.11
  #
  # Builds a tree view of a symbols file (showing all includes)
  #
-diff -u -r -p xkeyboard-config-2.42.orig/tests/test_rules_xml.py xkeyboard-config-2.42/tests/test_rules_xml.py
---- xkeyboard-config-2.42.orig/tests/test_rules_xml.py	2024-12-09 14:33:45.854374000 +0100
-+++ xkeyboard-config-2.42/tests/test_rules_xml.py	2024-12-09 14:35:35.266642000 +0100
+Index: xkeyboard-config-2.44/tests/test_rules_xml.py
+===================================================================
+--- xkeyboard-config-2.44.orig/tests/test_rules_xml.py
++++ xkeyboard-config-2.44/tests/test_rules_xml.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/env python3.11
  #
  # Call with pytest. Requires XKB_CONFIG_ROOT to be set
  
-diff -u -r -p xkeyboard-config-2.42.orig/tests/test_xkb_symbols.py xkeyboard-config-2.42/tests/test_xkb_symbols.py
---- xkeyboard-config-2.42.orig/tests/test_xkb_symbols.py	2024-12-09 14:33:45.884365000 +0100
-+++ xkeyboard-config-2.42/tests/test_xkb_symbols.py	2024-12-09 14:35:39.039457000 +0100
+Index: xkeyboard-config-2.44/tests/test_xkb_symbols.py
+===================================================================
+--- xkeyboard-config-2.44.orig/tests/test_xkb_symbols.py
++++ xkeyboard-config-2.44/tests/test_xkb_symbols.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python3
 +#!/usr/bin/env python3.11
--- xkeyboard-config.spec.orig
+++ xkeyboard-config.spec
@@ -15,21 +15,23 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+%define original_package_name xkeyboard-config
 
-Name:           xkeyboard-config
+Name:           %{original_package_name}-smarlayout
 Version:        2.44
 Release:        0
 Summary:        The X Keyboard Extension
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/X11/Utilities
 URL:            https://www.freedesktop.org/Software/XKeyboardConfig
-Source:         https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
+Source:         https://xorg.freedesktop.org/archive/individual/data/%{original_package_name}/%{original_package_name}-%{version}.tar.xz
 # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
 Patch109:       n_disable-2xalt_2xctrl-toggle.diff
 Patch110:       n_fi-kotoistus-metainfo.patch
 %if 0%{?suse_version} < 1550
 Patch0:         python-3.11.patch
 %endif
+Patch200:       smarlayout.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  meson
@@ -45,6 +47,11 @@ BuildRequires:  pkgconfig(xorg-macros) >
 Requires(post): coreutils
 BuildArch:      noarch
 
+Conflicts:      %{original_package_name}
+Conflicts:      %{original_package_name}-lang
+Obsoletes:      %{original_package_name}
+Provides:       %{original_package_name}
+
 %description
 The X Keyboard Extension essentially replaces the core protocol
 definition of keyboard. The extension makes possible to clearly and
@@ -56,7 +63,7 @@ make keyboards more accessible to people
 %lang_package
 
 %prep
-%autosetup -p1
+%autosetup -p1 -n %{original_package_name}-%{version}
 
 %build
 %{meson} \
@@ -71,7 +78,7 @@ mkdir -p %{buildroot}%{_localstatedir}/l
 # Bug 335553
 mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/
 ln -snf %{_localstatedir}/lib/xkb/compiled/ %{buildroot}%{_datadir}/X11/xkb/compiled
-%find_lang %{name}
+%find_lang %{original_package_name}
 %fdupes -s %{buildroot}%{_datadir}/X11/xkb
 
 %post
@@ -87,7 +94,7 @@ rm -rf %{_localstatedir}/lib/xkb/compile
 %{_datadir}/pkgconfig/*.pc
 %{_mandir}/man7/*
 
-%files lang -f %{name}.lang
+%files lang -f %{original_package_name}.lang
 %license COPYING
 
 %changelog
Places