We need to set disable_external_rpath to disable RPATH in qdoc

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
5.15.11
2023-11-10 09:34:51 +02:00 · 2023-10-08 16:24:43 +02:00 · 2023-07-21 16:08:28 +00:00 · 2023-06-25 17:10:34 +02:00 · 2023-06-13 10:26:00 +02:00
3 changed files with 22 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,3 +18,5 @@
 /qttools-everywhere-opensource-src-5.15.7.tar.xz
 /qttools-everywhere-opensource-src-5.15.8.tar.xz
 /qttools-everywhere-opensource-src-5.15.9.tar.xz
+/qttools-everywhere-opensource-src-5.15.10.tar.xz
+/qttools-everywhere-opensource-src-5.15.11.tar.xz
--- a/qt5-qttools.spec
+++ b/qt5-qttools.spec
@ -12,8 +12,8 @@

 Summary: Qt5 - QtTool components
 Name:    qt5-qttools
-Version: 5.15.9
-Release: 1%{?dist}
+Version: 5.15.11
+Release: 1.0.riscv64%{?dist}

 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:     http://www.qt.io
@ -183,6 +183,7 @@ Requires: %{name}-common = %{version}-%{release}

 %build
 %{qmake_qt5} \
+  CONFIG+=disable_external_rpath \
  %{?no_examples}

 %make_build
@ -245,7 +246,7 @@ sed -i -e 's| Qt5UiPlugin||g' %{buildroot}%{_qt5_libdir}/pkgconfig/Qt5Designer.p
 %if 0%{?fedora} || 0%{?rhel} > 6
 %check
 # verify validity of Qt5Designer.pc
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig:$PKG_CONFIG_PATH
 pkg-config --print-requires --print-requires-private Qt5Designer
 export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix}
 export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH
@ -482,6 +483,21 @@ fi


 %changelog
+* Fri Nov 10 2023 David Abdurachmanov <davidlt@rivosinc.com> - 5.15.11-1.0.riscv64
+- Set disable_external_rpath to avoid RPATHs in qdoc
+
+* Fri Oct 06 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-1
+- 5.15.11
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.10-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sun Jun 25 2023 Kalev Lember <klember@redhat.com> - 5.15.10-2
+- Fix self tests when building for flatpak
+
+* Mon Jun 12 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.10-1
+- 5.15.10
+
 * Tue Apr 11 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
 - 5.15.9

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qttools-everywhere-opensource-src-5.15.9.tar.xz) = ddd2a47fe51e9a6e650123eda097ea037971f01f9210cea9c1d13c7a8e581e436a41c954f83def0a8ee35c30f388627809e3eb4bbf27b5e3ece6a55f7d777067
+SHA512 (qttools-everywhere-opensource-src-5.15.11.tar.xz) = 7aa66964dfc4bd144ee828a5c278b3127c5b269c6fb0e5363e7d2377ba19165e04719636659cb30fee471de26740d3d8692068459e1764d9f84a7737f24c4884
Author	SHA1	Message	Date
David Abdurachmanov	42265b0260	We need to set disable_external_rpath to disable RPATH in qdoc Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>	2023-11-10 09:34:51 +02:00
Jan Grulich	9ad3c69cd9	5.15.11	2023-10-08 16:24:43 +02:00
Fedora Release Engineering	8859f681df	Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>	2023-07-21 16:08:28 +00:00
Kalev Lember	6faddadc32	Fix self tests when building for flatpak Avoid throwing away the contents of the PKG_CONFIG_PATH env variable that the build system sets up, and only append to it. This fixes self tests for flatpak builds where the build system sets PKG_CONFIG_PATH in order to find libraries in both /usr and /app.	2023-06-25 17:10:34 +02:00
Jan Grulich	6fb131e6a0	5.15.10	2023-06-13 10:26:00 +02:00