开源软件构建与测试

_service:tar_scm:xkeyboard-config.spec Changed

@@ -1,14 +1,14 @@
 Name:		xkeyboard-config
-Version:	2.33
-Release:	1
+Version:	2.38
+Release:	2
 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.xz
 
 
 BuildArch:      noarch
-BuildRequires:	gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp
+BuildRequires:	gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp meson
 BuildRequires:	pkgconfig(x11) >= 1.4.3 pkgconfig(xorg-macros) >= 1.12	pkgconfig(xproto) >= 7.0.20
 
 %description
@@ -29,13 +29,16 @@
 %prep
 %autosetup -n %{name}-%{version} -p1 
 
+# fix taiwan to china taiwan
+sed -i 's|Taiwanese|Chinese Taiwan|' po/* rules/base.xml symbols/cn symbols/sun_vndr/tw symbols/tw
+sed -i 's|Taiwan)|Taiwan China)|' po/* geometry/sun rules/base.xml symbols/tw
+
 %build
-autoreconf -v --force --install || exit 1
-%configure --enable-compat-rules --with-xkb-base=%{_datadir}/X11/xkb --with-xkb-rules-symlink=xorg
-%make_build
+%meson -Dcompat-rules=true -Dxorg-rules-symlinks=true
+%meson_build
 
 %install
-%make_install
+%meson_install
 
 {
    FILESLIST=${PWD}/files.list
@@ -62,6 +65,15 @@
 %{_mandir}/man7/xkeyboard-config.*
 
 %changelog
+* Sat May 06 2023 leeffo <liweiganga@uniontech.com> - 2.38-2
+- fix taiwan to china taiwan
+
+* Mon Feb 06 2023 zhangpan <zhangpan@h-partners.com> - 2.38-1
+- update to 2.38
+
+* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 2.33-2
+- Rebuild for next release
+
 * Sat Nov 27 2021 wangkerong<wangkerong@huawei.com> - 2.33-1
 - update to 2.33-1

_service Changed

_service:tar_scm:xkeyboard-config-2.33.tar.bz2 -> _service:tar_scm:xkeyboard-config-2.38.tar.xz Changed

Changes of Revision 2