Fix typo in polish keyboard layout

xkeyboard-config 2.23.1
use autosetup
This commit is contained in:
Peter Hutterer 2018-02-02 09:04:11 +10:00
parent 8cc721a8e7
commit 4c9ee365c2
4 changed files with 35 additions and 23 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@ xkeyboard-config-1.9.tar.bz2
/xkeyboard-config-2.21.tar.bz2 /xkeyboard-config-2.21.tar.bz2
/xkeyboard-config-2.22.tar.bz2 /xkeyboard-config-2.22.tar.bz2
/xkeyboard-config-2.23.tar.bz2 /xkeyboard-config-2.23.tar.bz2
/xkeyboard-config-2.23.1.tar.bz2

View File

@ -0,0 +1,25 @@
From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001
From: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
Date: Thu, 1 Feb 2018 15:37:46 +0100
Subject: [PATCH xkeyboard-config] Fix typo in Polish symbols file
https://bugs.freedesktop.org/show_bug.cgi?id=104904
---
symbols/pl | 1 -
1 file changed, 1 deletion(-)
diff --git a/symbols/pl b/symbols/pl
index 52e7959..800cb85 100644
--- a/symbols/pl
+++ b/symbols/pl
@@ -497,7 +497,6 @@ partial alphanumeric_keys
include "sun_vndr/pl(sun_type6)"
};
-------------------------------
//Glagolica
partial alphanumeric_keys
xkb_symbols "glagolica"
--
2.14.3

View File

@ -1 +1 @@
SHA512 (xkeyboard-config-2.23.tar.bz2) = 5a455d7bce3c10869c340dc406c4775c62b078f5090d13e2d9df3eb1a860b5877334d3987af4bc8d468932a6cbc200a3e2ec889a12ee004d88f45fd61afffb6e SHA512 (xkeyboard-config-2.23.1.tar.bz2) = d651bb89c265e58abe8bba4af6683364a8023cb73af7d00f401f33960e44fa94a7d8a8fdd2483d6703d1c261ca72ae5f2b53f543cfb70b2f571cfe9dcb80c3ba

View File

@ -6,7 +6,7 @@
Summary: X Keyboard Extension configuration data Summary: X Keyboard Extension configuration data
Name: xkeyboard-config Name: xkeyboard-config
Version: 2.23 Version: 2.23.1
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
License: MIT License: MIT
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@ -21,6 +21,7 @@ Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
# Submitted upstream # Submitted upstream
Patch1: 0001-Add-evdev-mappings-for-KEY_SOUND-KEY_UWB-KEY_WWAN-an.patch Patch1: 0001-Add-evdev-mappings-for-KEY_SOUND-KEY_UWB-KEY_WWAN-an.patch
Patch2: 0001-Fix-typo-in-Polish-symbols-file.patch
BuildArch: noarch BuildArch: noarch
@ -53,27 +54,7 @@ Requires: pkgconfig
Development files for %{name}. Development files for %{name}.
%prep %prep
%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %autosetup -S git
%if 0%{?gitdate}
git checkout -b fedora
sed -i 's/git/&+ssh/' .git/config
if [ -z "$GIT_COMMITTER_NAME" ]; then
git config user.email "x@fedoraproject.org"
git config user.name "Fedora X Ninjas"
fi
git commit -am "%{name} %{version}"
%else
git init
if [ -z "$GIT_COMMITTER_NAME" ]; then
git config user.email "x@fedoraproject.org"
git config user.name "Fedora X Ninjas"
fi
git add .
git commit -a -q -m "%{name} %{version} baseline."
%endif
git am -p1 %{patches} < /dev/null
%build %build
AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1 AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
@ -111,6 +92,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%{_datadir}/pkgconfig/xkeyboard-config.pc %{_datadir}/pkgconfig/xkeyboard-config.pc
%changelog %changelog
* Wed Feb 07 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23.1-1
- Fix typo in polish keyboard layout
- xkeyboard-config 2.23.1
- use autosetup
* Wed Jan 31 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23-1 * Wed Jan 31 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.23-1
- xkeyboard-config 2.23 - xkeyboard-config 2.23