fix for .so symlinks installed in %_qt6_prefix instead of %_qt6_archdatadir [release 6.6.1-4mamba;Mon Jan 15 2024]

This commit is contained in:
Silvan Calarco 2024-01-16 10:12:16 +01:00
parent c8a1cb6246
commit ca3d762c25

View File

@ -18,7 +18,7 @@
Name: qt6-qtbase Name: qt6-qtbase
Version: 6.6.1 Version: 6.6.1
Release: 3mamba Release: 4mamba
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
@ -420,12 +420,12 @@ popd
%endif %endif
%if "%{_qt6_libdir}" == "%{_libdir}" %if "%{_qt6_libdir}" == "%{_libdir}"
install -d -m0755 %{buildroot}%{_qt6_prefix}/lib install -d -m0755 %{buildroot}%{_qt6_archdatadir}/lib
pushd %{buildroot}%{_libdir} pushd %{buildroot}%{_libdir}
for f in *.so; do for f in *.so; do
ln -sf ../../$f %{buildroot}%{_qt6_prefix}/lib/${f} ln -sf ../../$f %{buildroot}%{_qt6_archdatadir}/lib/${f}
done done
ln -sf %{_qt6_libdir}/libGL.so %{buildroot}%{_qt6_prefix}/lib/libGL.so ln -sf %{_qt6_libdir}/libGL.so %{buildroot}%{_qt6_archdatadir}/lib/libGL.so
popd popd
%endif %endif
@ -611,8 +611,8 @@ echo "\
%{_qt6_libdir}/libQt6*.a %{_qt6_libdir}/libQt6*.a
%{_qt6_libdir}/libQt6*.so %{_qt6_libdir}/libQt6*.so
%{_qt6_libdir}/libQt6*.prl %{_qt6_libdir}/libQt6*.prl
%dir %{_qt6_prefix}/lib/ %dir %{_qt6_archdatadir}/lib/
%{_qt6_prefix}/lib/*.so %{_qt6_archdatadir}/lib/*.so
%{_libdir}/qt6/metatypes/qt6*.json %{_libdir}/qt6/metatypes/qt6*.json
%dir %{_libdir}/cmake/Qt6* %dir %{_libdir}/cmake/Qt6*
%{_libdir}/cmake/Qt6*/* %{_libdir}/cmake/Qt6*/*
@ -643,6 +643,9 @@ echo "\
%{_qt6_plugindir}/sqldrivers/libqsqlite.so %{_qt6_plugindir}/sqldrivers/libqsqlite.so
%changelog %changelog
* Mon Jan 15 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.6.1-4mamba
- fix for .so symlinks installed in %_qt6_prefix instead of %_qt6_archdatadir
* Sat Jan 13 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.6.1-3mamba * Sat Jan 13 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.6.1-3mamba
- updated rpm macros file - updated rpm macros file