updated 4 packages

kbd-2.8.0-1

nfs-utils-2.8.3-1

xkeyboard-config-2.45-1

xorg-x11-xkb-utils-7.7-6

k/kbd/kbd-vl.spec

@@ -1,5 +1,3 @@
-%global convert_xkb 0
-
 # {_exec_prefix}/lib/kbd is correct even on x86_64.
 # It is traditionally used for kdb data (console fonts, keymaps, ...).
 # It is not used for any shared objects/executables.
@@ -8,9 +6,9 @@
 Summary: Tools for configuring the console (keyboard, virtual terminals, etc.)
 Summary(ja): コンソール(キーボードや仮想ターミナル等)を設定するツール群
 Name: kbd
-Version: 2.2.0
+Version: 2.8.0
 Release: 1%{?_dist_release}
-Group: System Environment/Base
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -22,33 +20,28 @@ Source3: xml2lst.pl
 Source4: vlock.pamd
 Source5: kbdinfo.1
 Source6: cz-map.patch
-Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
-BuildRequires: bison, flex, gettext, pam-devel
-%if 0%{convert_xkb}
-BuildRequires: console-setup
-%endif
-BuildRoot: %{_tmppath}/%{name}-root
 # Patch0: puts additional information into man pages
-Patch0: kbd-1.15-keycodes-man.patch
+Patch0:         kbd-1.15-keycodes-man.patch
 # Patch1: sparc modifications
-Patch1: kbd-1.15-sparc.patch
+Patch1:         kbd-1.15-sparc.patch
 # Patch2: adds default unicode font to unicode_start script
-Patch2: kbd-1.15-unicode_start.patch
-# Patch3: add missing dumpkeys option to man page
-Patch3: kbd-1.15.3-dumpkeys-man.patch
-# Patch4: fixes decimal separator in Swiss German keyboard layout, bz 882529
-Patch4: kbd-1.15.5-sg-decimal-separator.patch
-# Patch5: adds xkb and legacy keymaps subdirs to loadkyes search path, bz 1028207
-Patch5: kbd-1.15.5-loadkeys-search-path.patch
-# Patch6: don't hardcode font used in unicode_start, take it from vconsole.conf,
+Patch2:         kbd-1.15-unicode_start.patch
+# Patch3: fixes decimal separator in Swiss German keyboard layout, bz 882529
+Patch3:         kbd-1.15.5-sg-decimal-separator.patch
+# Patch4: adds xkb and legacy keymaps subdirs to loadkyes search path, bz 1028207
+Patch4:         kbd-1.15.5-loadkeys-search-path.patch
+# Patch5: don't hardcode font used in unicode_start, take it from vconsole.conf,
 #   bz 1101007
-Patch6: kbd-2.0.2-unicode-start-font.patch
-# Patch7: fixes issues found by static analysis
-Patch7:         kbd-2.0.4-covscan-fixes.patch
-# Patch8: fix flags
-Patch8:         kbd-2.2.0-fix-flags.patch
-# Patch9: workaround -Werror=format-security build error
-Patch9:         kbd-2.2.0-format-security.patch
+Patch5:         kbd-2.0.2-unicode-start-font.patch
+# Patch6: fixes issues found by static analysis
+Patch6:         kbd-2.4.0-covscan-fixes.patch
+# Patch7: adds vlock option to issue prompt before invokation of pam stack
+Patch7:         kbd-2.0.4-vlock-add-prompt-option.patch
+
+Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode
+BuildRequires: bison, flex, gettext, pam-devel
+BuildRequires: console-setup, xkeyboard-config
+BuildRoot: %{_tmppath}/%{name}-root
 
 Obsoletes: console-tools open
 Provides: console-tools open
@@ -61,23 +54,16 @@ The %{name} package contains tools for managing a Linux
 system's console's behavior, including the keyboard, the screen
 fonts, the virtual terminals and font files.
 
+
+%debug_package
+
+
 %prep
 
 %setup -q -a 1 -a 2
 cp -fp %{SOURCE3} .
 cp -fp %{SOURCE6} .
-%patch0 -p1 -b .keycodes-man
-%patch1 -p1 -b .sparc
-%patch2 -p1 -b .unicode_start
-%patch3 -p1 -b .dumpkeys-man
-%patch4 -p1 -b .sg-decimal-separator
-%if 0%{convert_xkb}
-%patch5 -p1 -b .loadkeys-search-path
-%endif
-%patch6 -p1 -b .unicode-start-font
-%patch7 -p1 -b .covscan-fixes
-%patch8 -p1 -b .fix-flags
-%patch9 -p1 -b .format-security
+%autopatch -p1
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -105,6 +91,7 @@ popd
 iconv -f iso-8859-1 -t utf-8 < "ChangeLog" > "ChangeLog_"
 mv "ChangeLog_" "ChangeLog"
 
+
 %build
 export OLD_PO_FILE_INPUT=yes
 
@@ -115,6 +102,7 @@ CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS
 %configure --prefix=%{_prefix} --datadir=%{kbd_datadir} --mandir=%{_mandir} --localedir=%{_datadir}/locale --enable-nls
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -147,21 +135,15 @@ ln -s openvt $RPM_BUILD_ROOT%{_bindir}/open
 ln -s openvt.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/open.1.gz
 
 # install kbdinfo manpage
-gzip -c %SOURCE5 > $RPM_BUILD_ROOT/%{_mandir}/man1/kbdinfo.1.gz
-
-# Move locale files to correct place
-cp -r $RPM_BUILD_ROOT%{kbd_datadir}/locale/ $RPM_BUILD_ROOT%{_datadir}/locale
-rm -rf $RPM_BUILD_ROOT%{kbd_datadir}/locale
+gzip -c %{SOURCE5} > $RPM_BUILD_ROOT/%{_mandir}/man1/kbdinfo.1.gz
 
 # Install PAM configuration for vlock
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/vlock
 
-%if 0%{convert_xkb}
 # Move original keymaps to legacy directory
 mkdir -p $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/legacy
-mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} $RPM_B
-UILD_ROOT%{kbd_datadir}/keymaps/legacy
+mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/{amiga,atari,i386,include,mac,ppc,sun} $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/legacy
 
 # Convert X keyboard layouts to console keymaps
 mkdir -p $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb
@@ -170,8 +152,7 @@ while read line; do
   XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
   echo "$XKBLAYOUT" >> layouts-list.lst
   XKBVARIANT=`echo "$line" | cut -d " " -f 2`
-  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xk
-b/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
+  ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
 done < layouts-variants.lst
 
 # Convert X keyboard layouts (plain, no variant)
@@ -185,28 +166,26 @@ zgrep -L "U+0041" $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/* | xargs rm -f
 
 # Rename the converted default fi (kotoistus) layout (#1117891)
 gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map.gz
-mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xk
-b/fi-kotoistus.map
+mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi-kotoistus.map
 gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi-kotoistus.map
 
-# Fix converted cz layout - add compose rules
-gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz
-patch $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map < %{SOURCE6}
-gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map
-%endif
+# Fix converted cz layout - add compose rules, if exists
+#if [ -f "$RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz" ]; then
+#  gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz
+#  patch $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map < %{SOURCE6}
+#  gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map
+#fi
 
 %find_lang %{name}
 
-%clean
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
 %triggerun -- kbd < 1.08-10.2
 /sbin/chkconfig --del keytable || :
 
+
 %files -f %{name}.lang
-%defattr(-,root,root)
 %license COPYING
-%doc ChangeLog AUTHORS README docs/doc/kbd.FAQ*.html docs/doc/font-formats/*.html docs/doc/utf/utf* docs/doc/dvorak/*
+%doc ChangeLog AUTHORS README docs/doc/font-formats/*.html docs/doc/dvorak/*
 /bin/*
 %{_bindir}/*
 %{_mandir}/*/*
@@ -215,6 +194,9 @@ gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map
 
 
 %changelog
+* Sun Jun  8 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.0-1
+- new upstream release.
+
 * Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.2.0-1
 - new upstream release.
 - imported Patch7-9 from rawhide.

n/nfs-utils/nfs-utils-vl.spec

@@ -5,10 +5,12 @@
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
+%{!?_udevrulesdir:%global _udevrulesdir /usr/lib/udev/rules.d}
+
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
 Name: nfs-utils
-Version: 2.5.1
+Version: 2.8.3
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
@@ -18,12 +20,10 @@ License: MIT and GPLv2 and GPLv2+ and BSD
 URL: https://sourceforge.net/projects/nfs/
 Source0: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
 
-#Source3: 24-nfs-server.conf
 Source1: id_resolver.conf
 Source2: lockd.conf
-Source4: nfsconvert.py
-Source5: nfsconvert.sh
-Source6: nfs-convert.service
+Source3: 24-nfs-server.conf
+Source4: 10-nfsv4.conf
 
 Source10: nfs.init
 Source11: nfslock.init
@@ -33,11 +33,9 @@ Source13: rpcgssd.init
 Source15: nfsdcld.init
 Source23: nfs.sysconfig
 
-Patch001: nfs-utils-2.5.2-rc3.patch
-Patch002: nfs-utils-2.5.1-rpcidmap-nodebug-msg.patch
+Patch001: nfs-utils.2.8.4-rc2.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
-Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
 Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
 Patch103: nfs-utils-2.3.1-systemd-gssproxy-restart.patch
 Patch104: nfs-utils-2.3.3-man-tcpwrappers.patch
@@ -62,7 +60,7 @@ Provides: umount.nfs4 = %{version}-%{release}
 Provides: sm-notify   = %{version}-%{release}
 Provides: start-statd = %{version}-%{release}
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: rpcbind, sed, gawk, sh-utils, fileutils, textutils, grep
 Requires: kmod, keyutils, quota
 BuildRequires: libevent-devel libcap-devel
@@ -73,6 +71,8 @@ BuildRequires: krb5-devel, libmount-devel
 BuildRequires: sqlite3-devel
 BuildRequires: libxml2-devel
 BuildRequires: libuuid-devel
+BuildRequires: libnl3-devel
+BuildRequires: readline-devel
 BuildRequires: rpcgen
 #if %{enablegss}
 #BuildRequires: libgssglue-devel
@@ -147,13 +147,15 @@ This package includes header files and libraries necessary for
 developing programs which use the libnfsidmap library.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %if %{with systemd}
 %autopatch -p1
 %else
 %patch001 -p1
-%patch002 -p1
 %endif
 
 # Remove .orig files
@@ -185,13 +187,14 @@ make %{?_smp_mflags} all
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}{/sbin,/usr/sbin}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
+mkdir -p %{buildroot}%{_mandir}/{man5,man8}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
 mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
+mkdir -p %{buildroot}%{_sysconfdir}/gssproxy
 %if %{with systemd}
 mkdir -p %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}/lib/systemd/system-generators
+mkdir -p %{buildroot}/usr/lib/systemd/system-generators
 %else
 mkdir -p %{buildroot}%{_initdir}
 %endif
@@ -204,15 +207,7 @@ install -m 644 nfs.conf  %{buildroot}%{_sysconfdir}
 install -m 644 support/nfsidmap/idmapd.conf %{buildroot}%{_sysconfdir}
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/request-key.d
 
-%if %{with systemd}
-install -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/nfsconvert
-mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/
-install -m 755 %{SOURCE5} %{buildroot}/%{_libexecdir}/nfs-utils/nfsconvert.sh
-install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}/lib/systemd/system-generators/
-mv -f %{buildroot}/usr/lib/systemd/system-generators/* %{buildroot}/lib/systemd/system-generators/
-
-%else
+%if %{without systemd}
 install -m 755 %{SOURCE10} %{buildroot}%{_initdir}/nfs
 install -m 755 %{SOURCE11} %{buildroot}%{_initdir}/nfslock
 install -m 755 %{SOURCE12} %{buildroot}%{_initdir}/rpcidmapd
@@ -225,6 +220,7 @@ install -m 755 %{SOURCE13} %{buildroot}%{_initdir}/rpcgssd
 
 mkdir -p %{buildroot}/run/sysconfig
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/modprobe.d/lockd.conf
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/gssproxy/
 
 rm -f %{buildroot}%{_libdir}/*.{a,la}
 rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
@@ -239,15 +235,13 @@ mkdir -p %{buildroot}/var/lib/nfs/statd/sm.bak
 mkdir -p %{buildroot}/var/lib/nfs/v4recovery
 mkdir -p %{buildroot}%{_sysconfdir}/exports.d
 
+mkdir -p %{buildroot}%{_sysconfdir}/nfsmount.conf.d
+install -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/nfsmount.conf.d
+
 # temporarily remove nfs.5 man page until util-linux gets upgraded...
 #rm -f %{buildroot}/%{_mandir}/man5/nfs.5*
 
 
-
-%clean
-rm -rf %{buildroot}
-
-
 %pre
 # move files so the running service will have this applied as well
 for x in gssd svcgssd idmapd ; do
@@ -289,17 +283,7 @@ fi
 
 %post
 %if %{with systemd}
-if [ $1 -eq 1 ] ; then
-	# Initial installation
-	/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
-	/bin/systemctl start nfs-client.target  >/dev/null 2>&1 || :
-fi
-
-# Enable nfs-convert so if an old configuration
-# exists a conversion will occur
-/bin/systemctl enable nfs-convert  >/dev/null 2>&1 || :
-
-%systemd_post nfs-server
+%systemd_post nfs-client.target nfs-server.service
 %else
 /sbin/chkconfig --add nfs
 /sbin/chkconfig --add nfslock
@@ -320,12 +304,9 @@ fi
 
 %preun
 %if %{with systemd}
+%systemd_preun nfs-client.target nfs-server.service
 if [ $1 -eq 0 ]; then
-	%systemd_preun nfs-client.target
-	%systemd_preun nfs-server.service
-
-    rm -rf /var/lib/nfs/statd
-    rm -rf /var/lib/nfs/v4recovery
+    ( : >%{_localstatedir}/lib/rpm-state/nfs-server.cleanup ) || :
 fi
 %else
 if [ "$1" = "0" -o -x /bin/systemctl ]; then
@@ -354,12 +335,14 @@ fi
 
 %postun
 %if %{with systemd}
-%systemd_postun_with_restart  nfs-client.target
-%systemd_postun_with_restart  nfs-server
-
-/bin/systemctl --system daemon-reload >/dev/null 2>&1 || :
+%systemd_postun_with_restart nfs-client.target nfs-server.service
+if [ -f %{_localstatedir}/lib/rpm-state/nfs-server.cleanup ]; then
+    rm %{_localstatedir}/lib/rpm-state/nfs-server.cleanup || :
+    rm -rf /var/lib/nfs/statd || :
+    rm -rf /var/lib/nfs/v4recovery || :
+fi
 %else
-if [ "$1" -ge 1 -a ! -x /bin/systemctl ]; then
+if [ "$1" -ge 1 -a ! -x /usr/bin/systemctl ]; then
     if [ -f /etc/rc.d/init.d/rpcidmapd ]; then
 	/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
     fi
@@ -380,9 +363,8 @@ if [ "$1" -ge 1 -a ! -x /bin/systemctl ]; then
 fi
 %endif
 
-%post -n libnfsidmap -p /sbin/ldconfig
-
-%postun -n libnfsidmap -p /sbin/ldconfig
+%triggerun -- nfs-utils < 2.5.1-2
+/bin/systemctl disable nfs-convert > /dev/null 2>&1 || :
 
 %triggerpostun -- nfs-server
 %if !%{with systemd}
@@ -399,15 +381,14 @@ fi
 /sbin/chkconfig --add nfslock
 %endif
 
+
 %files
-%defattr(-,root,root)
 %doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
 %doc linux-nfs/THANKS linux-nfs/TODO
 %if %{with systemd}
-/lib/systemd/system-generators/*
+/usr/lib/systemd/system-generators/*
 %{_unitdir}/*
-%{_sbindir}/nfsconvert
-%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
+%attr(0600,root,root) %config(noreplace) %{_udevrulesdir}/60-nfs.rules
 %else
 %config %{_initdir}/nfs
 %config %{_initdir}/nfsdcld
@@ -422,6 +403,8 @@ fi
 %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf
 %config(noreplace) %{_sysconfdir}/nfs.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/nfsmount.conf.d/10-nfsv4.conf
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/gssproxy/24-nfs-server.conf
 %dir %{_sysconfdir}/exports.d
 %dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
@@ -433,8 +416,6 @@ fi
 %config(noreplace) /var/lib/nfs/rmtab
 %config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
 /sbin/rpc.statd
-#/sbin/osd_login
-/sbin/nfsdcltrack
 %{_sbindir}/exportfs
 %{_sbindir}/nfsstat
 %{_sbindir}/rpcdebug
@@ -456,6 +437,11 @@ fi
 %{_sbindir}/nfsdcld
 %{_sbindir}/nfsdclddb
 %{_sbindir}/nfsdclnts
+%{_sbindir}/rpcctl
+%{_sbindir}/nfsdctl
+%{_sbindir}/fsidd
+%{_libexecdir}/nfsrahead
+%{_udevrulesdir}/99-nfs.rules
 %{_mandir}/*/*
 
 %attr(4755,root,root)   /sbin/mount.nfs
@@ -480,6 +466,9 @@ fi
 
 
 %changelog
+* Sun Jun  8 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.8.3-1
+- new upstream release.
+
 * Thu Aug 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.1-1
 - new upstream release.
 

x/xkeyboard-config/xkeyboard-config-vl.spec

@@ -1,15 +1,19 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 2.11
+Version: 2.45
 Release: 1%{?_dist_release}
-License: MIT
-Group: User Interface/X
-URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
+Group: admin-tools,desktop-other
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
+License: MIT
+URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig/
+Source0: http://www.x.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
+BuildRequires: meson
+BuildRequires: libxslt
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-util-macros
 BuildRequires: xorg-x11-proto-devel
@@ -17,9 +21,6 @@ BuildRequires: xkbcomp
 BuildRequires: perl(XML::Parser)
 Provides: xkbdata
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 xkeyboard-config alternative xkb data files
 
@@ -27,45 +28,59 @@ xkeyboard-config alternative xkb data files
 %prep
 %setup -q
 
+
 %build
-%configure \
-    --enable-compat-rules \
-    --with-xkb-base=%{_datadir}/X11/xkb \
-    --disable-xkbcomp-symlink \
-    --with-xkb-rules-symlink=xorg
+%meson \
+	-D compat-rules=true \
+	-D xkb-base=%{_datadir}/X11/xkb \
+	-D xorg-rules-symlinks=true \
+	%{nil}
+%meson_build
 
-make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%meson_install
+
+pushd $RPM_BUILD_ROOT%{_datadir}/X11
+rm -f xkb
+ln -sf ../xkeyboard-config-2 xkb
+popd
 
-make install DESTDIR=$RPM_BUILD_ROOT
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
-
 %find_lang %{name}
+%find_lang %{name}-2
 
 # Create filelist
 {
    FILESLIST=${PWD}/files.list
    pushd $RPM_BUILD_ROOT
-   find ./usr/share/X11/xkb -type d | sed -e "s/^\./%dir /g" > $FILESLIST
-   find ./usr/share/X11/xkb -type f | sed -e "s/^\.//g" >> $FILESLIST
+   find ./usr/share/xkeyboard-config* -type d | sed -e "s/^\./%dir /g" > $FILESLIST
+   find ./usr/share/xkeyboard-config* -type f | sed -e "s/^\.//g" >> $FILESLIST
+   find ./usr/share/xkeyboard-config* -type l | sed -e "s/^\.//g" >> $FILESLIST
    popd
 }
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
-%files -f files.list -f %{name}.lang
-%defattr(-,root,root,-)
-%{_datadir}/X11/xkb/rules/xorg
-%{_datadir}/X11/xkb/rules/xorg.lst
-%{_datadir}/X11/xkb/rules/xorg.xml
-%{_datadir}/pkgconfig/xkeyboard-config.pc
+%pretrans
+if [ $1 -ge 1 ]; then
+  if [ ! -L %{_datadir}/X11/xkb ]; then
+    rm -rf %{_datadir}/X11/xkb
+  fi
+fi
+
+
+%files -f files.list -f %{name}.lang -f %{name}-2.lang
+%doc AUTHORS README.md COPYING docs/README.* docs/HOWTO.*
+%{_mandir}/man7/xkeyboard-config*
+%{_datadir}/X11/xkb
+%{_datadir}/pkgconfig/xkeyboard-config*.pc
 
 
 %changelog
+* Sun Jun  8 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.45-1
+- new upstream release.
+
 * Wed Apr 23 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.11-1
 - new upstream release
 

x/xorg-x11-xkb-utils/xorg-x11-xkb-utils-vl.spec

@@ -2,18 +2,21 @@ Summary: X.Org X11 xkb utilities
 Summary(ja): X.Org X11 xkb ユーティリティ
 Name: xorg-x11-xkb-utils
 Version: 7.7
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
+Group: admin-tools,desktop-other
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: MIT/X11
-Group: User Interface/X
 URL: http://www.x.org
 
 # use the macro so the doc dir is changed automagically
-%define xkbutils_version 1.0.4
-Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.3.1.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.4.tar.bz2
-Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.4.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.3.1.tar.bz2
+%define xkbutils_version 1.0.6
+Source0: https://ftp.x.org/archive/individual/app/xkbutils-%{xkbutils_version}.tar.xz
+Source1: https://ftp.x.org/archive/individual/app/xkbcomp-1.4.7.tar.xz
+Source2: https://ftp.x.org/archive/individual/app/xkbevd-1.1.6.tar.xz
+Source3: https://ftp.x.org/archive/individual/app/xkbprint-1.0.7.tar.xz
+Source4: https://ftp.x.org/archive/individual/app/setxkbmap-1.3.4.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: pkgconfig
@@ -23,21 +26,23 @@ BuildRequires: libXaw-devel >= 1.0.5
 BuildRequires: libXt-devel
 BuildRequires: libXext-devel
 BuildRequires: libXpm-devel
+BuildRequires: libXrandr-devel
 BuildRequires: bison
 BuildRequires: flex
 Provides: setxkbmap, xkbcomp, xkbevd, xkbprint, xkbutils
 Obsoletes: XFree86
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
 %description
 X.Org X11 xkb utilities
 
+
+%debug_package
+
+
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
 
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP"
 for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
@@ -47,8 +52,8 @@ for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
     popd
 done
 
+
 %install
-rm -rf $RPM_BUILD_ROOT
 for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
     pushd $pkg-*
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -56,11 +61,8 @@ for pkg in xkbutils setxkbmap xkbcomp xkbevd xkbprint ; do
 done
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/xkbcomp.pc
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
 %doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README xkbutils-%{xkbutils_version}/ChangeLog
 %{_bindir}/setxkbmap
@@ -78,7 +80,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbvleds.1*
 %{_mandir}/man1/xkbwatch.1*
 
+
 %changelog
+* Sun Jun  8 2025 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.7-6
+- xkbutils-1.0.6.
+- xkbcomp-1.4.7.
+- xkbevd-1.1.6.
+- xkbprint-1.0.7.
+- setxkbmap-1.3.4.
+
 * Thu May 05 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 7.7-5
 - xkbcomp-1.3.1