Accepting request 1280906 from KDE:Qt:5.15

Qt 5.15.17, try #2 (forwarded request 1280892 from favogt)

OBS-URL: https://build.opensuse.org/request/show/1280906
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdoc?expand=0&rev=55

libqt5-qtdoc.changes

@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed May 28 10:09:54 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Update to 5.15.17:
+  * See individual module packages for changelogs
+- Use system ninja to skip bundled ninja for webengine configuration
+
+-------------------------------------------------------------------
+Wed Mar 19 11:21:43 UTC 2025 - Fabian Vogt <fvogt@suse.com>
+
+- Remove obsolete BuildRequires on pcre-devel
+
+-------------------------------------------------------------------
+Wed Feb 26 10:14:12 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Redefine %_libdir on 64 bit archs to work around
+  gh#rpm-software-management/rpm#3126
+
 -------------------------------------------------------------------
 Wed Sep  4 21:44:21 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 

libqt5-qtdoc.spec

@@ -17,10 +17,10 @@
 # nodebuginfo
 
 
-%define real_version 5.15.15
+%define real_version 5.15.17
-%define tar_version qt-everywhere-opensource-src-5.15.15
+%define tar_version qt-everywhere-opensource-src-5.15.17
 Name:           libqt5-qtdoc
-Version:        5.15.15
+Version:        5.15.17
 Release:        0
 Summary:        Qt 5 API Documentation
 License:        LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only
@@ -52,8 +52,8 @@ BuildRequires:  libqt5-qttools-devel >= %{version}
 BuildRequires:  libqt5-qttools-doc >= %{version}
 BuildRequires:  libtiff-devel
 BuildRequires:  lksctp-tools-devel
+BuildRequires:  ninja
 BuildRequires:  openssl-devel
-BuildRequires:  pcre-devel
 BuildRequires:  pcre2-devel
 BuildRequires:  pkgconfig
 BuildRequires:  postgresql-devel
@@ -137,6 +137,16 @@ required.
 %autosetup -p1 -n qt-everywhere-src-%{version}
 
 %build
+# Due to a behaviour change in rpm, %%libdir is always '/usr/lib' with 'BuildArch: noarch'. We need to redefine it to find tools in '/usr/lib64/qt5/bin' when needed
+# (https://github.com/rpm-software-management/rpm/issues/3126)
+if [ -e "/usr/lib64/qt5/bin/qdoc" ]; then
+echo "Redefining _libdir to work around rpm behaviour change"
+_libdir=/usr/lib64
+else
+_libdir=/usr/lib
+fi
+%define _libdir $_libdir
+
 # We need to link to some of the programs used as that the source assumes they were just built.
 ln -s %{_bindir}/rcc-qt5 qtbase/bin/rcc
 ln -s %{_bindir}/uic-qt5 qtbase/bin/uic
@@ -144,9 +154,6 @@ ln -s %{_bindir}/moc-qt5 qtbase/bin/moc
 ln -s %{_libqt5_bindir} qttools/bin
 
 # Create the Makefiles which are required.
-# To-Do: Clean up of the options and with this also the BuildRequires.
-
-# FIXME: you should use the %%configure macro
 ./configure \
     -verbose \
     -prefix %{_prefix} \

qt-everywhere-opensource-src-5.15.17.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5c34b2e8054d23cbd6c98715af8766a61c7f346ac687aa2d80edd73f8073d2d2
+size 664569588