File project.diff of Package 15.4-xkeyboard-config

--- xkeyboard-config.spec.orig
+++ xkeyboard-config.spec
@@ -15,15 +15,16 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%define original_package_name xkeyboard-config
 
-Name:           xkeyboard-config
+Name:           %{original_package_name}-smarlayout
 Version:        2.23.1
 Release:        0
 Summary:        The X Keyboard Extension
 License:        GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0
 Group:          System/X11/Utilities
 Url:            http://www.freedesktop.org/Software/XKeyboardConfig
-Source:         http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
+Source:         http://xorg.freedesktop.org/archive/individual/data/%{original_package_name}/%{original_package_name}-%{version}.tar.bz2
 Patch0:         U_Map-evdev-keycodes-KEY_RFKILL-and-KEY_WWAN-to-XF86RF.patch
 Patch100:       n_suse-ctrl-alt-bksp-terminate.patch
 # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
@@ -32,6 +33,7 @@ Patch110:       U_Fix-typo-in-Polish-sym
 Patch111:       U_Updating-Old-Hungarian.patch
 Patch112:       U_Fix-media-keys-lag-on-ABNT2-keyboard.patch
 Patch113:       U_Add-the-new-AZERTY-layout-norm-NF-Z71-300.patch
+Patch200:       smarlayout.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
@@ -44,6 +46,11 @@ Recommends:     %{name}-lang
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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
@@ -55,7 +62,7 @@ make keyboards more accessible to people
 %lang_package
 
 %prep
-%setup -q
+%setup -q -n %{original_package_name}-%{version}
 translation-update-upstream
 %patch0 -p1
 %patch100 -p1
@@ -64,6 +71,7 @@ translation-update-upstream
 %patch111 -p1
 %patch112 -p1
 %patch113 -p1
+%patch200 -p1
 
 %build
 %configure \
@@ -80,7 +88,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
@@ -96,7 +104,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