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 (Revision 8e873e2d52ee752277fa2df956bdbeee)

Currently displaying revision 8e873e2d52ee752277fa2df956bdbeee , Show latest

--- xkeyboard-config.spec.orig
+++ xkeyboard-config.spec
@@ -15,19 +15,21 @@
 # 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.30
 Release:        0
 Summary:        The X Keyboard Extension
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later 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
 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
 Patch109:       n_disable-2xalt_2xctrl-toggle.diff
 Patch110:       U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
+Patch200:       smarlayout.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
@@ -51,11 +53,12 @@ make keyboards more accessible to people
 %lang_package
 
 %prep
-%setup -q
+%setup -q -n %{original_package_name}-%{version}
 #translation-update-upstream
 %patch100 -p1
 %patch109 -p1
 %patch110 -p1
+%patch200 -p1
 
 %build
 %configure \
@@ -72,7 +75,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
@@ -88,7 +91,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 (Revision 8e873e2d52ee752277fa2df956bdbeee)

Places