rpms/qt6-qtbase
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Disable rpath

Browse Source 
Resolves: bz#1982699
This commit is contained in:
Jan Grulich 2021-09-07 15:12:00 +02:00
parent f4d634ab18
commit 883f4b7410
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt6-qtbase.spec
View File

@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd)
Name: qt6-qtbase Name: qt6-qtbase
Summary: Qt6 - QtBase components Summary: Qt6 - QtBase components
Version: 6.2.0%{?unstable:~%{prerelease}} Version: 6.2.0%{?unstable:~%{prerelease}}
Release: 2%{?dist} Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details # See LGPL_EXCEPTIONS.txt, for exception details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -383,6 +383,7 @@ export MAKEFLAGS="%{?_smp_mflags}"
-DQT_FEATURE_sql_mysql=ON \ -DQT_FEATURE_sql_mysql=ON \
-DQT_FEATURE_sql_psql=ON \ -DQT_FEATURE_sql_psql=ON \
-DQT_FEATURE_sql_sqlite=ON \ -DQT_FEATURE_sql_sqlite=ON \
-DQT_FEATURE_rpath=OFF \
%{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \ %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \
%{?pcre:-DQT_FEATURE_system_pcre2=ON} \ %{?pcre:-DQT_FEATURE_system_pcre2=ON} \
%{?sqlite:-DQT_FEATURE_system_sqlite=ON} \ %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \
@ -491,9 +492,6 @@ rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake
# Use better location for some new scripts in qtbase-6.0.1 # Use better location for some new scripts in qtbase-6.0.1
mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake
# Remove useless files
rm -rf %{buildroot}/%{_qt6_libdir}/cmake/Qt6/config.tests/static_link_order
%check %check
# verify Qt6.pc # verify Qt6.pc
export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@ -833,6 +831,10 @@ make check -k ||:
%changelog %changelog
* Tue Sep 07 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta3-3
- Disable rpath
Resolves: bz#1982699
* Tue Aug 31 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta3-2 * Tue Aug 31 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta3-2
- Fix file conflict with qt5-qttools - Fix file conflict with qt5-qttools
- Rebuild against older libglvnd - Rebuild against older libglvnd