From 1e08a9e40722079721029369a4eae05ffd33ba48 Mon Sep 17 00:00:00 2001 From: chengguipeng Date: Sat, 25 Jul 2020 14:59:42 +0800 Subject: [PATCH] xkeyboard-config: Update to 2.30. Signed-off-by: chengguipeng --- ...yntax-error-spurious-git-conflict-ma.patch | 27 +++++++++++++++++ xkeyboard-config.spec | 29 +++++++++---------- 2 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch diff --git a/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch b/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch new file mode 100644 index 0000000..bd75b28 --- /dev/null +++ b/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch @@ -0,0 +1,27 @@ +From c8d68304c826567f27f5a913dd38f6e045b81483 Mon Sep 17 00:00:00 2001 +From: Pritam Baral +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 { [ period, U0964, U0965, U093d ] }; + key { [ 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 + diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 3397685..ca9dff3 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,13 +1,15 @@ -Name: xkeyboard-config -Version: 2.30 -Release: 1 -Summary: The X Keyboard Extension -License: MIT +Name: xkeyboard-config +Version: 2.30 +Release: 1 +Summary: The X Keyboard Extension +License: MIT 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 -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(xorg-macros) >= 1.12 BuildRequires: pkgconfig(xproto) >= 7.0.20 @@ -29,20 +31,17 @@ Header files for xkeyboard-config %package_help %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version} -p1 %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 %make_build %install %make_install -# Remove unnecessary symlink -rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled -%find_lang %{name} - { FILESLIST=${PWD}/files.list pushd $RPM_BUILD_ROOT @@ -64,8 +63,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled %files help %defattr(-,root,root) -%doc README docs/README docs/HOWTO.* TODO NEWS -%{_mandir}/man7/*.gz +%doc README docs/README.* docs/HOWTO.* TODO NEWS +%{_mandir}/man7/xkeyboard-config.* %changelog * Mon Jul 20 2020 chengguipeng - 2.30-1