diff --git a/0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch b/0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch new file mode 100644 index 0000000..1b7778a --- /dev/null +++ b/0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch @@ -0,0 +1,44 @@ +From 7e789cffc6999a30b5d7ded03496b1d3dad1dc86 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 15 Dec 2011 15:53:55 +1000 +Subject: [PATCH] rules: Serbian keyboards are cyrillic by default + +Signed-off-by: Peter Hutterer +--- + rules/base.xml.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/base.xml.in b/rules/base.xml.in +index 4ee879b..a90e994 100644 +--- a/rules/base.xml.in ++++ b/rules/base.xml.in +@@ -4075,7 +4075,7 @@ + + rs + <_shortDescription>sr +- <_description>Serbian ++ <_description>Serbian (Cyrillic) + + srp + +@@ -4084,7 +4084,7 @@ + + + yz +- <_description>Serbian (Z and ZHE swapped) ++ <_description>Serbian (Cyrillic, Z and ZHE swapped) + + + +@@ -4114,7 +4114,7 @@ + + + alternatequotes +- <_description>Serbian (with guillemets) ++ <_description>Serbian (Cyrillic with guillemets) + + + +-- +1.7.7.1 + diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index cc9144e..1da527e 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -7,7 +7,7 @@ Summary: X Keyboard Extension configuration data Name: xkeyboard-config Version: 2.4.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist} License: MIT Group: User Interface/X URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig @@ -19,6 +19,8 @@ Source2: commitid Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}-%{version}.tar.bz2 %endif +Patch01: 0001-rules-Serbian-keyboards-are-cyrillic-by-default.patch + BuildArch: noarch BuildRequires: pkgconfig @@ -68,7 +70,7 @@ git add . git commit -a -q -m "%{name} %{version} baseline." %endif -#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) +git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec) %build intltoolize @@ -110,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %{_datadir}/pkgconfig/xkeyboard-config.pc %changelog +* Thu Dec 22 2011 Peter Hutterer 2.4.1-2 +- Change Serbian layouts to mark the cyrillic ones (#769751) + * Wed Oct 05 2011 Peter Hutterer 2.4.1-1 - xkeyboard-config 2.4.1 - change source URL from ftp.x.org to http://xorg.freedesktop.org, ftp takes