From 0d1a949a1b243644561cfd83e03790916b2a670c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 9 Mar 2024 01:13:12 +0100 Subject: [PATCH] fix bindir symlinks which should point to /usr/%{lib}/qt6/libexec instead of bin [release 6.6.2-2mamba;Fri Mar 08 2024] --- qt6-qtbase.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index e7d9225..c8dce52 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -18,7 +18,7 @@ Name: qt6-qtbase Version: 6.6.2 -Release: 1mamba +Release: 2mamba Summary: A multiplatform, C++ GUI application development framework Group: System/Libraries Vendor: openmamba @@ -408,14 +408,18 @@ install -D -m644 %{S:12} \ %if "%{_qt6_bindir}" != "%{_bindir}" install -d %{buildroot}%{_bindir} pushd %{buildroot}%{_qt6_bindir} -for f in androiddeployqt androidtestrunner qt-cmake; do +for f in androiddeployqt qt-cmake; do ln -sf ./%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f} ln -sf ../%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f}-qt6 done -for f in moc qdbuscpp2xml qdbusxml2cpp qlalr qmake qvkgen rcc tracegen uic; do +for f in qdbuscpp2xml qdbusxml2cpp qmake; do #ln -sf ./%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f} ln -sf ../%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f}-qt6 done +for f in moc qlalr qvkgen rcc tracegen uic; do + #ln -sf ./%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f} + ln -sf ../%{_lib}/qt6/libexec/$f %{buildroot}%{_bindir}/${f}-qt6 +done popd %endif @@ -586,7 +590,6 @@ echo "\ %defattr(-,root,root) %{_rpmmacrodir}/macros.qt6 %{_bindir}/androiddeployqt* -%{_bindir}/androidtestrunner* %{_bindir}/moc* %{_bindir}/qmake* %{_bindir}/qlalr* @@ -643,6 +646,9 @@ echo "\ %{_qt6_plugindir}/sqldrivers/libqsqlite.so %changelog +* Fri Mar 08 2024 Silvan Calarco 6.6.2-2mamba +- fix bindir symlinks which should point to /usr/%{lib}/qt6/libexec instead of bin + * Wed Feb 14 2024 Automatic Build System 6.6.2-1mamba - automatic version update by autodist