diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..ad708550e1042142d50fca8e4b2e4cc5ef426916 --- /dev/null +++ b/download @@ -0,0 +1 @@ +bd0ff892fe937e39ec3bb4daeb348f76 libxkbcommon-1.0.3.tar.xz diff --git a/libxkbcommon-0.9.1.tar.xz b/libxkbcommon-0.9.1.tar.xz deleted file mode 100644 index d981c9dd766723dd699ced4a85b63c8d325d56e3..0000000000000000000000000000000000000000 Binary files a/libxkbcommon-0.9.1.tar.xz and /dev/null differ diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 28c08885090b61aa95bc092a32865dd2583115ec..1fed43c141bf858d6dfca1ea0f9da05648f5fc86 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,14 +1,14 @@ #global gitdate 20120917 Name: libxkbcommon -Version: 0.9.1 -Release: 1%{?gitdate:.%{gitdate}}%{?dist} +Version: 1.0.3 +Release: 4%{?gitdate:.%{gitdate}}%{?dist} Summary: X.Org X11 XKB parsing library License: MIT URL: http://www.x.org %if 0%{?gitdate} -Source0: %{name}-%{gitdate}.tar.bz2 +Source0: %{name}-%{gitdate}.tar.xz %else Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz %endif @@ -19,6 +19,7 @@ BuildRequires: xorg-x11-util-macros byacc flex bison BuildRequires: xorg-x11-proto-devel libX11-devel BuildRequires: xkeyboard-config-devel BuildRequires: pkgconfig(xcb-xkb) >= 1.10 +BuildRequires: libxml2-devel Requires: xkeyboard-config @@ -48,6 +49,13 @@ Requires: %{name}-x11%{?_isa} = %{version}-%{release} %description x11-devel X.Org X11 XKB keymap creation library development package +%package utils +Summary: X.Org X11 XKB parsing utilities +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description utils +%{name}-utils is a set of utilities to analyze and test XKB parsing. + %prep %autosetup -S git @@ -66,16 +74,21 @@ X.Org X11 XKB keymap creation library development package %license LICENSE %{_libdir}/libxkbcommon.so.0.0.0 %{_libdir}/libxkbcommon.so.0 +%{_libdir}/libxkbregistry.so.0.0.0 +%{_libdir}/libxkbregistry.so.0 %files devel %{_libdir}/libxkbcommon.so +%{_libdir}/libxkbregistry.so %dir %{_includedir}/xkbcommon/ %{_includedir}/xkbcommon/xkbcommon.h %{_includedir}/xkbcommon/xkbcommon-compat.h %{_includedir}/xkbcommon/xkbcommon-compose.h %{_includedir}/xkbcommon/xkbcommon-keysyms.h %{_includedir}/xkbcommon/xkbcommon-names.h +%{_includedir}/xkbcommon/xkbregistry.h %{_libdir}/pkgconfig/xkbcommon.pc +%{_libdir}/pkgconfig/xkbregistry.pc %ldconfig_scriptlets x11 @@ -88,12 +101,90 @@ X.Org X11 XKB keymap creation library development package %{_includedir}/xkbcommon/xkbcommon-x11.h %{_libdir}/pkgconfig/xkbcommon-x11.pc +%files utils +%{_bindir}/xkbcli +%{_libexecdir}/xkbcommon/xkbcli-compile-keymap +%{_libexecdir}/xkbcommon/xkbcli-how-to-type +%{_libexecdir}/xkbcommon/xkbcli-interactive-evdev +%{_libexecdir}/xkbcommon/xkbcli-interactive-x11 +%{_libexecdir}/xkbcommon/xkbcli-list +%{_mandir}/man1/xkbcli-compile-keymap.1.gz +%{_mandir}/man1/xkbcli-how-to-type.1.gz +%{_mandir}/man1/xkbcli-interactive-evdev.1.gz +%{_mandir}/man1/xkbcli-interactive-x11.1.gz +%{_mandir}/man1/xkbcli-list.1.gz +%{_mandir}/man1/xkbcli.1.gz + %changelog -* Fri Nov 01 2019 Peter Hutterer 0.9.1-1 -- libxkbcommon 0.9.1 (#1728801) +* Mon Aug 09 2021 Mohan Boddu - 1.0.3-4 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Fri Apr 16 2021 Mohan Boddu - 1.0.3-3 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Nov 24 2020 Peter Hutterer 1.0.3-1 +- libxkbcommon 1.0.3 + +* Mon Nov 23 2020 Peter Hutterer 1.0.2-1 +- libxkbcommon 1.0.2 + +* Fri Sep 11 2020 Pete Walter - 1.0.1-1 +- libxkbcommon 1.0.1 + +* Mon Sep 07 2020 Peter Hutterer 1.0.0-1 +- libxkbcommon 1.0.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 0.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 0.10.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 20 2020 Peter Hutterer 0.10.0-1 +- libxkbcommon 0.10.0 + +* Fri Dec 13 2019 Peter Hutterer 0.9.1-3 +- convert ssharp to the correct uppercase letter + +* Fri Nov 01 2019 Peter Hutterer 0.9.1-2 +- drop the wayland-devel BR, we disable the wayland test programs + +* Fri Oct 25 2019 Peter Hutterer 0.9.1-1 +- libxkbcommon 0.9.1 + +* Mon Oct 21 2019 Peter Hutterer 0.8.4-3 +- switch to meson as build system + +* Thu Jul 25 2019 Fedora Release Engineering - 0.8.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 19 2019 Peter Hutterer 0.8.4-1 +- libxkbcommon 0.8.4 + +* Wed Feb 13 2019 Peter Hutterer 0.8.3-1 +- libxkbcommon 0.8.3 + +* Fri Feb 01 2019 Fedora Release Engineering - 0.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Aug 06 2018 Peter Hutterer 0.8.2-1 +- libxkbcommon 0.8.2 + +* Tue Jul 31 2018 Florian Weimer - 0.8.0-6 +- Rebuild with fixed binutils + +* Mon Jul 30 2018 Peter Hutterer 0.8.0-5 +- Fix invalid pointer passed to FreeStmt() + +* Fri Jul 13 2018 Fedora Release Engineering - 0.8.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Thu Aug 23 2018 Peter Hutterer 0.8.2-1 -- libxkbcommon 0.8.2 (#1619541) +* Wed Feb 07 2018 Fedora Release Engineering - 0.8.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild * Sat Feb 03 2018 Igor Gnatenko - 0.8.0-2 - Switch to %%ldconfig_scriptlets diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh index 507c2a039d292d38e8aef1de48d5696da3da9532..b2b32dda812531f6a0786a9313a0e783f86de40f 100755 --- a/make-git-snapshot.sh +++ b/make-git-snapshot.sh @@ -3,7 +3,7 @@ DIRNAME=libxkbcommon-$( date +%Y%m%d ) rm -rf $DIRNAME -git clone git://anongit.freedesktop.org/git/xorg/lib/libxkbcommon $DIRNAME +git clone https://github.com/xkbcommon/libxkbcommon $DIRNAME cd $DIRNAME if [ -z "$1" ]; then git log | head -1 @@ -13,5 +13,5 @@ fi git log | head -1 | awk '{ print $2 }' > ../commitid git repack -a -d cd .. -tar jcf $DIRNAME.tar.bz2 $DIRNAME +tar Jcf $DIRNAME.tar.xz $DIRNAME rm -rf $DIRNAME