public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <filiperosset@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/xkeyboard-config] rawhide: update to 2.48 plus spec cleanup and modernization
Date: Thu, 16 Jul 2026 06:03:00 GMT	[thread overview]
Message-ID: <178418178079.1.12885785464951535284.rpms-xkeyboard-config-9d9cb22d956c@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/xkeyboard-config
            Branch : rawhide
            Commit : 9d9cb22d956cf257fca014ba449487606bf5cb6b
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-07-13T17:20:53-03:00
            Stats  : +27/-7 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/xkeyboard-config/c/9d9cb22d956cf257fca014ba449487606bf5cb6b?branch=rawhide

            Log:
            update to 2.48 plus spec cleanup and modernization

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/.gitignore b/.gitignore
index 0252c7f..814bc59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /xkeyboard-config-*.tar.xz
+/xkeyboard-config-2.48.tar.xz.sig
+/SergeyUdaltsov-C933A145.gpg

diff --git a/sources b/sources
index 116503a..eab9043 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (xkeyboard-config-2.47.tar.xz) = bd9b70ec5c8957e087f6c12272725044e6e124c15c7cbbfffb7f3c231944984d3302adda604da05464b7be6c91b5461e74fbec8544ac21b06e3bd8c748fd04e3
+SHA512 (xkeyboard-config-2.48.tar.xz) = 2c24f9cca97b8863ff2e71fc3780e9c3e22e4486c80d45022e2208d559bdb40824bdb8a4037e0d5690900b6e080ddef4eacfc8bff843e04ba5ab86940f1fb6ea
+SHA512 (xkeyboard-config-2.48.tar.xz.sig) = b726a07747c84bf48b54d5f795f018ca23dc434e67cd67b7394a94403ab3d5e5cfe4b50ebf41324fd8164a16d014760d46c392a3a757238d7546e3e22c1185c6
+SHA512 (SergeyUdaltsov-C933A145.gpg) = d9148977797c2504f90cc732993aa8de1f868c3b79b983ac83c97325977c780310ba701446f9c86f5506552c893e256ec8fad5334b6400a2b09b26e939416ff2

diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index cd4f0a5..4751581 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -10,7 +10,7 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.47
+Version:    2.48
 Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    HPND AND HPND-sell-variant AND X11 AND X11-distribute-modifications-variant AND MIT AND MIT-open-group AND xkeyboard-config-Zinoviev
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -20,21 +20,27 @@ Source0:    %{name}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 %else
-Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
+Source0:    https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
+Source1:    https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz.sig
+Source3:    SergeyUdaltsov-C933A145.gpg
 %endif
 
 BuildArch:  noarch
 
-BuildRequires:  gettext gettext-devel
-BuildRequires:  meson
+BuildRequires:  gettext
+BuildRequires:  gettext-devel
+BuildRequires:  git-core
+BuildRequires:  gnupg2
+BuildRequires:  libxkbcommon-devel
 BuildRequires:  libxslt
+BuildRequires:  meson
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(x11) >= 1.4.3
 BuildRequires:  pkgconfig(xorg-macros) >= 1.12
 BuildRequires:  pkgconfig(xproto) >= 7.0.20
+BuildRequires:  python3-pytest
 BuildRequires:  xkbcomp
-BuildRequires:  git-core
 
 %description
 This package contains configuration data used by the X Keyboard Extension (XKB),
@@ -49,6 +55,9 @@ Requires:   pkgconfig
 Development files for %{name}.
 
 %prep
+%if ! 0%{?gitdate}
+gpgv2 --keyring %{SOURCE3} %{SOURCE1} %{SOURCE0}
+%endif
 %autosetup -S git
 
 %build
@@ -65,6 +74,9 @@ ln -srf $RPM_BUILD_ROOT%{_datadir}/%{pkgconfig_name} $RPM_BUILD_ROOT%{_datadir}/
 %find_lang %{pkgconfig_name}
 %find_lang %{name}
 
+%check
+%meson_test
+
 # Note: 2.45 changed the install location from the decades-old /usr/share/X11/xkb
 # to a package-specific /usr/share/xkeyboard-config-2. Upstream installs a symlink
 # for /usr/share/X11/xkb since those two dirctories are guaranteed to be the same.
@@ -92,7 +104,8 @@ if st and st.type == "directory" then
 end
 
 %files -f %{pkgconfig_name}.lang -f %{name}.lang
-%doc AUTHORS README.md COPYING docs/README.* docs/HOWTO.*
+%license COPYING
+%doc AUTHORS README.md docs/README.* docs/HOWTO.*
 %{_mandir}/man7/%{name}.*
 %{_mandir}/man7/%{pkgconfig_name}.*
 %{_datadir}/X11/xkb
@@ -104,6 +117,9 @@ end
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Jul 13 2026 Filipe Rosset <filiperosset@fedoraproject.org> - 2.48-1
+- update to 2.48
+
 * Wed Feb 25 2026 Peter Hutterer <peter.hutterer@redhat.com> - 2.47-1
 - xkeyboard-config 2.47
 

                 reply	other threads:[~2026-07-16  6:03 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178418178079.1.12885785464951535284.rpms-xkeyboard-config-9d9cb22d956c@fedoraproject.org \
    --to=filiperosset@fedoraproject.org \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox