packages/xkeyboard-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xkeyboard-config: Update to 2.30.

Browse Source 
Signed-off-by: chengguipeng <chengguipeng1@huawei.com>
This commit is contained in:
chengguipeng 2020-07-25 14:59:42 +08:00
parent b2bb80b0da
commit 1e08a9e407
2 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch Normal file
View File

@ -0,0 +1,27 @@
From c8d68304c826567f27f5a913dd38f6e045b81483 Mon Sep 17 00:00:00 2001
From: Pritam Baral <pritam@pritambaral.com>
Date: Thu, 11 Jun 2020 04:02:27 +0000
Subject: [PATCH xkeyboard-config] Fix symbols/in syntax error: spurious git
conflict marker
Introduced in https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/93ea944c2599584a4dd1add1725fafd19fef2535#904fcb1a2ae93630fa2905a7fd0ced3f8e50a6e8_2329_2329
---
symbols/in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/symbols/in b/symbols/in
index 3ca78a2..b3a5ca9 100644
--- a/symbols/in
+++ b/symbols/in
@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" {
key <AB09> { [ period, U0964, U0965, U093d ] };
key <AB10> { [ U092f, question, slash, question ] };
};
-=======
+
// EXTRAS:
// Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.
--
2.26.2

29
xkeyboard-config.spec
View File

@ -1,13 +1,15 @@
Name: xkeyboard-config Name: xkeyboard-config
Version: 2.30 Version: 2.30
Release: 1 Release: 1
Summary: The X Keyboard Extension Summary: The X Keyboard Extension
License: MIT License: MIT
URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig
Source0: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 Source0: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
Patch01: 0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
BuildArch: noarch BuildArch: noarch
BuildRequires: gettext gettext-devel libtool libxslt intltool perl(XML::Parser) pkgconfig(glib-2.0) BuildRequires: gettext gettext-devel intltool libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0)
BuildRequires: pkgconfig(x11) >= 1.4.3 BuildRequires: pkgconfig(x11) >= 1.4.3
BuildRequires: pkgconfig(xorg-macros) >= 1.12 BuildRequires: pkgconfig(xorg-macros) >= 1.12
BuildRequires: pkgconfig(xproto) >= 7.0.20 BuildRequires: pkgconfig(xproto) >= 7.0.20
@ -29,20 +31,17 @@ Header files for xkeyboard-config
%package_help %package_help
%prep %prep
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1 #AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
autoreconf -v --force --install || exit 1
%configure --enable-compat-rules --with-xkb-base=%{_datadir}/X11/xkb --with-xkb-rules-symlink=xorg %configure --enable-compat-rules --with-xkb-base=%{_datadir}/X11/xkb --with-xkb-rules-symlink=xorg
%make_build %make_build
%install %install
%make_install %make_install
# Remove unnecessary symlink
rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%find_lang %{name}
{ {
FILESLIST=${PWD}/files.list FILESLIST=${PWD}/files.list
pushd $RPM_BUILD_ROOT pushd $RPM_BUILD_ROOT
@ -64,8 +63,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%files help %files help
%defattr(-,root,root) %defattr(-,root,root)
%doc README docs/README docs/HOWTO.* TODO NEWS %doc README docs/README.* docs/HOWTO.* TODO NEWS
%{_mandir}/man7/*.gz %{_mandir}/man7/xkeyboard-config.*
%changelog %changelog
* Mon Jul 20 2020 chengguipeng<chengguipeng1@huawei.com> - 2.30-1 * Mon Jul 20 2020 chengguipeng<chengguipeng1@huawei.com> - 2.30-1