diff --git a/.gitignore b/.gitignore index 527cd0c..c896181 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -SOURCES/setxkbmap-1.3.0.tar.bz2 -SOURCES/xkbcomp-1.3.0.tar.bz2 -SOURCES/xkbevd-1.1.3.tar.bz2 -SOURCES/xkbprint-1.0.3.tar.bz2 +SOURCES/setxkbmap-1.3.1.tar.bz2 +SOURCES/xkbcomp-1.4.2.tar.bz2 +SOURCES/xkbevd-1.1.4.tar.bz2 +SOURCES/xkbprint-1.0.4.tar.bz2 SOURCES/xkbutils-1.0.4.tar.bz2 diff --git a/.xorg-x11-xkb-utils.metadata b/.xorg-x11-xkb-utils.metadata index 8138768..cbcdbfb 100644 --- a/.xorg-x11-xkb-utils.metadata +++ b/.xorg-x11-xkb-utils.metadata @@ -1,5 +1,5 @@ -d10885d6215b06789961c67557df46406f99c2b7 SOURCES/setxkbmap-1.3.0.tar.bz2 -113c93679c9245141b5899240f59fcc8227d8dc1 SOURCES/xkbcomp-1.3.0.tar.bz2 -543963ba22b019b4e059e8605eb418f8a712b76e SOURCES/xkbevd-1.1.3.tar.bz2 -4e7c91a137f0746202b3a74bbaf49c849484aa30 SOURCES/xkbprint-1.0.3.tar.bz2 +560a02cf6f7db1f79739a4f2bd4f8050c7eb6f43 SOURCES/setxkbmap-1.3.1.tar.bz2 +9a39cf7a562c152465e04fc7cf1002c59f883870 SOURCES/xkbcomp-1.4.2.tar.bz2 +629fea940692f9d971dfae36cd697b13337caaba SOURCES/xkbevd-1.1.4.tar.bz2 +c0c1e71a32f7d8bfc40539e7f315ca7e02d99205 SOURCES/xkbprint-1.0.4.tar.bz2 b09aef7cc3853eb12dbda332f55adec3add4447b SOURCES/xkbutils-1.0.4.tar.bz2 diff --git a/SPECS/xorg-x11-xkb-utils.spec b/SPECS/xorg-x11-xkb-utils.spec index 4b7b185..7a321a7 100644 --- a/SPECS/xorg-x11-xkb-utils.spec +++ b/SPECS/xorg-x11-xkb-utils.spec @@ -1,24 +1,24 @@ # Component versions -%define setxkbmap 1.3.0 -%define xkbcomp 1.3.0 -%define xkbevd 1.1.3 -%define xkbprint 1.0.3 +%define setxkbmap 1.3.1 +%define xkbcomp 1.4.2 +%define xkbevd 1.1.4 +%define xkbprint 1.0.4 %define xkbutils 1.0.4 Summary: X.Org X11 xkb utilities Name: xorg-x11-xkb-utils Version: 7.7 -Release: 12%{?dist} +Release: 14%{?dist} License: MIT Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://www.x.org/pub/individual/app/setxkbmap-%{setxkbmap}.tar.bz2 -Source1: http://www.x.org/pub/individual/app/xkbcomp-%{xkbcomp}.tar.bz2 -Source2: http://www.x.org/pub/individual/app/xkbevd-%{xkbevd}.tar.bz2 -Source3: http://www.x.org/pub/individual/app/xkbprint-%{xkbprint}.tar.bz2 -Source4: http://www.x.org/pub/individual/app/xkbutils-%{xkbutils}.tar.bz2 +Source0: https://www.x.org/pub/individual/app/setxkbmap-%{setxkbmap}.tar.bz2 +Source1: https://www.x.org/pub/individual/app/xkbcomp-%{xkbcomp}.tar.bz2 +Source2: https://www.x.org/pub/individual/app/xkbevd-%{xkbevd}.tar.bz2 +Source3: https://www.x.org/pub/individual/app/xkbprint-%{xkbprint}.tar.bz2 +Source4: https://www.x.org/pub/individual/app/xkbutils-%{xkbutils}.tar.bz2 BuildRequires: byacc BuildRequires: pkgconfig(x11) @@ -26,9 +26,6 @@ BuildRequires: pkgconfig(xaw7) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xt) -# xkbutils/xkbvleds requires libXext and libXpm, but autotools don't check/require them: -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xpm) Provides: setxkbmap = %{setxkbmap} @@ -41,6 +38,7 @@ X.Org X11 xkb core utilities. Summary: X.Org X11 xkb utilities development package Group: Development/Libraries Requires: pkgconfig +Requires: xkbcomp %description devel X.Org X11 xkb utilities development files. @@ -112,6 +110,16 @@ X.Org X11 xkb gadgets. %{_libdir}/pkgconfig/xkbcomp.pc %changelog +* Fri Jun 08 2018 Peter Hutterer 7.7-14 +- xkbcomp 1.4.2 (#1564634) + +* Tue May 15 2018 Peter Hutterer 7.7-13 +- Sync with F28 (#1564634) +- setxkbmap 1.3.1 +- xkbcomp 1.4.1 +- xkbevd 1.1.4 +- xkbprint 1.0.4 + * Mon Apr 20 2015 Peter Hutterer 7.7-12 - Merge with F22 (#1194895)