fix bindir symlinks which should point to /usr/%{lib}/qt6/libexec instead of bin [release 6.6.2-2mamba;Fri Mar 08 2024]

This commit is contained in:
Silvan Calarco 2024-03-09 01:13:12 +01:00
parent f5ee28608c
commit 0d1a949a1b

View File

@ -18,7 +18,7 @@
Name: qt6-qtbase Name: qt6-qtbase
Version: 6.6.2 Version: 6.6.2
Release: 1mamba Release: 2mamba
Summary: A multiplatform, C++ GUI application development framework Summary: A multiplatform, C++ GUI application development framework
Group: System/Libraries Group: System/Libraries
Vendor: openmamba Vendor: openmamba
@ -408,14 +408,18 @@ install -D -m644 %{S:12} \
%if "%{_qt6_bindir}" != "%{_bindir}" %if "%{_qt6_bindir}" != "%{_bindir}"
install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_bindir}
pushd %{buildroot}%{_qt6_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}
ln -sf ../%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f}-qt6 ln -sf ../%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f}-qt6
done 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}
ln -sf ../%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f}-qt6 ln -sf ../%{_lib}/qt6/bin/$f %{buildroot}%{_bindir}/${f}-qt6
done 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 popd
%endif %endif
@ -586,7 +590,6 @@ echo "\
%defattr(-,root,root) %defattr(-,root,root)
%{_rpmmacrodir}/macros.qt6 %{_rpmmacrodir}/macros.qt6
%{_bindir}/androiddeployqt* %{_bindir}/androiddeployqt*
%{_bindir}/androidtestrunner*
%{_bindir}/moc* %{_bindir}/moc*
%{_bindir}/qmake* %{_bindir}/qmake*
%{_bindir}/qlalr* %{_bindir}/qlalr*
@ -643,6 +646,9 @@ echo "\
%{_qt6_plugindir}/sqldrivers/libqsqlite.so %{_qt6_plugindir}/sqldrivers/libqsqlite.so
%changelog %changelog
* Fri Mar 08 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 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 <autodist@openmamba.org> 6.6.2-1mamba * Wed Feb 14 2024 Automatic Build System <autodist@openmamba.org> 6.6.2-1mamba
- automatic version update by autodist - automatic version update by autodist