added pretrans and posttrans scripts to fix upgrade from dir to symlink [release 2.45-2mamba;Sun Jun 15 2025]

xkeyboard-config.spec

@@ -1,22 +1,21 @@
 Name:          xkeyboard-config
-Version:       2.26
-Release:       1mamba
+Version:       2.45
+Release:       2mamba
 Summary:       X Keyboard Configuration Database
 Group:         System/X11
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://www.freedesktop.org/wiki/Software/XKeyboardConfig
-Source:        ftp://ftp.x.org/pub/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.bz2
+URL:           https://www.freedesktop.org/wiki/Software/XKeyboardConfig/
+Source:        https://x.org/archive/individual/data/xkeyboard-config/xkeyboard-config-%{version}.tar.xz
 License:       MIT
 BuildArch:     noarch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
 Provides:      xkbdata
-Obsoletes:     xkbdata
+Obsoletes:     xkbdata < 2.35.1
 Provides:      xorg-xkbdata
-Obsoletes:     xorg-xkbdata
+Obsoletes:     xorg-xkbdata < 2.35.1
 
 %description
 The non-arch keyboard configuration database for X Window. The goal is to provide the consistent, well-structured, frequently released open source of X keyboard configuration data for X Window System implementations (free, open source and commercial). The project is targeted to XKB-based systems.
@@ -28,46 +27,138 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description devel
 The non-arch keyboard configuration database for X Window. The goal is to provide the consistent, well-structured, frequently released open source of X keyboard configuration data for X Window System implementations (free, open source and commercial). The project is targeted to XKB-based systems.
-This package contains static libraries and header files need for development.
+This package contains static libraries and header files needed for development.
 
 %prep
 %setup -q
 
 %build
-%configure \
-   --with-xkb-base=%{_datadir}/X11/xkb \
-   --with-xkb-rules-symlink=xorg \
-   --enable-compat-rules=yes
+%meson \
+   -Dxkb-base="%{_datadir}/X11/xkb" \
+   -Dxorg-rules-symlinks=true \
+   -Dcompat-rules=true
 
-%make
+%meson_build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-%makeinstall
+%meson_install
 
-%find_lang %{name}
+%find_lang %{name} --all-name
 
-%pre
-# fix upgrade from xkbdata
-[ -d %{_datadir}/X11/xkb/symbols/pc ] && \
-   mv %{_datadir}/X11/xkb/symbols/pc /usr/share/X11/xkb/symbols/pc.rpmsave
-exit 0
+%pretrans -p <lua>
+-- Define the path to directory being replaced below.
+-- DO NOT add a trailing slash at the end.
+paths = {"%{_datadir}/X11/xkb"}
+for _,path in pairs(paths) 
+do
+  st = posix.stat(path)
+  if st and st.type == "directory" then
+    status = os.rename(path, path .. ".rpmmoved")
+    if not status then
+      suffix = 0
+      while not status do
+        suffix = suffix + 1
+        status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
+      end
+      os.rename(path, path .. ".rpmmoved")
+    end
+  end
+end
+
+%posttrans
+if [ ! -L /lib -a ! -e /lib/firmware ]; then
+   # make /lib/firmware symlink to /usr/lib/firmware
+   ln -s ../usr/lib/firmware /lib/firmware
+fi
+paths="\
+%{_datadir}/X11/xkb"
+
+for path in $paths; do
+   [ -e "${path}.rpmmoved" ] && \
+      rm -rf "${path}.rpmmoved"
+done
+:
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%{_datadir}/X11/xkb/*
+%{_datadir}/X11/xkb
+%dir %{_datadir}/xkeyboard-config-2
+%{_datadir}/xkeyboard-config-2/*
 %{_mandir}/man7/xkeyboard-config.7*
+%{_mandir}/man7/xkeyboard-config-2.7*
 %doc AUTHORS COPYING
 
 %files devel
 %defattr(-,root,root)
 %{_datadir}/pkgconfig/xkeyboard-config.pc
-%doc ChangeLog NEWS README TODO
+%{_datadir}/pkgconfig/xkeyboard-config-2.pc
+%doc ChangeLog.md README.md
 
 %changelog
+* Sun Jun 15 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 2.45-2mamba
+- added pretrans and posttrans scripts to fix upgrade from dir to symlink
+
+* Mon Jun 09 2025 Automatic Build System <autodist@openmamba.org> 2.45-1mamba
+- automatic version update by autodist
+
+* Sun Mar 02 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 2.44-1mamba
+- update to 2.44
+
+* Sat Oct 05 2024 Automatic Build System <autodist@openmamba.org> 2.43-1mamba
+- automatic version update by autodist
+
+* Sat Jun 08 2024 Automatic Build System <autodist@openmamba.org> 2.42-1mamba
+- automatic version update by autodist
+
+* Tue Feb 06 2024 Automatic Build System <autodist@openmamba.org> 2.41-1mamba
+- automatic version update by autodist
+
+* Sat Oct 07 2023 Automatic Build System <autodist@mambasoft.it> 2.40-1mamba
+- automatic version update by autodist
+
+* Tue Jun 13 2023 Automatic Build System <autodist@mambasoft.it> 2.39-1mamba
+- automatic version update by autodist
+
+* Tue Feb 07 2023 Automatic Build System <autodist@mambasoft.it> 2.38-1mamba
+- automatic version update by autodist
+
+* Thu Oct 06 2022 Automatic Build System <autodist@mambasoft.it> 2.37-1mamba
+- automatic version update by autodist
+
+* Sat Jun 04 2022 Automatic Build System <autodist@mambasoft.it> 2.36-1mamba
+- automatic version update by autodist
+
+* Sat Apr 16 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 2.35.1-1mamba
+- update to 2.35.1
+
+* Tue Oct 05 2021 Automatic Build System <autodist@mambasoft.it> 2.34-1mamba
+- automatic version update by autodist
+
+* Fri Jun 18 2021 Automatic Build System <autodist@mambasoft.it> 2.33-1mamba
+- automatic version update by autodist
+
+* Thu Feb 25 2021 Automatic Build System <autodist@mambasoft.it> 2.32-1mamba
+- automatic version update by autodist
+
+* Fri Oct 09 2020 Automatic Build System <autodist@mambasoft.it> 2.31-1mamba
+- automatic version update by autodist
+
+* Wed Jun 03 2020 Automatic Build System <autodist@mambasoft.it> 2.30-1mamba
+- automatic version update by autodist
+
+* Thu Feb 06 2020 Automatic Build System <autodist@mambasoft.it> 2.29-1mamba
+- automatic version update by autodist
+
+* Thu Oct 24 2019 Automatic Build System <autodist@mambasoft.it> 2.28-1mamba
+- automatic version update by autodist
+
+* Fri May 31 2019 Automatic Build System <autodist@mambasoft.it> 2.27-1mamba
+- automatic version update by autodist
+
 * Tue Feb 05 2019 Automatic Build System <autodist@mambasoft.it> 2.26-1mamba
 - automatic version update by autodist