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

Overview Repositories Revisions Requests Users Attributes Meta

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

--- xkeyboard-config.spec.orig
+++ xkeyboard-config.spec
@@ -15,17 +15,19 @@
 # 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.40
 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
+Patch200:       smarlayout.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  meson
@@ -37,6 +39,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
@@ -48,8 +55,9 @@ make keyboards more accessible to people
 %lang_package
 
 %prep
-%setup -q
+%setup -q -n %{original_package_name}-%{version}
 %patch109 -p1
+%patch200 -p1
 
 %build
 %{meson} \
@@ -64,7 +72,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
@@ -80,6 +88,7 @@ rm -rf %{_localstatedir}/lib/xkb/compile
 %{_datadir}/pkgconfig/*.pc
 %{_mandir}/man7/*
 
-%files lang -f %{name}.lang
+%files lang -f %{original_package_name}.lang
+%defattr(-,root,root)
 
 %changelog

Places

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

Places