From c9f9e45dee0d9a013a4abb5cc4423907935fedf8d053f58e62eb44665e0f7c27 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 15 Dec 2020 08:22:30 +0000 Subject: [PATCH 1/5] Accepting request 855943 from home:Vogtinator:qt5.15 - Drop baselibs.conf, -32bit packages are not used anywhere and due to system assimp not providing -32bit packages broken anyway OBS-URL: https://build.opensuse.org/request/show/855943 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=13 --- baselibs.conf | 12 ------------ libqt5-qt3d.changes | 6 ++++++ libqt5-qt3d.spec | 1 - 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 06f3745..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,12 +0,0 @@ -libQt53DCore5 -libQt53DAnimation5 -libQt53DExtras5 -libQt53DInput5 -libQt53DLogic5 -libQt53DQuick5 -libQt53DQuickAnimation5 -libQt53DQuickExtras5 -libQt53DQuickInput5 -libQt53DQuickRender5 -libQt53DQuickScene2D5 -libQt53DRender5 diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index bdde139..431f72b 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 15 08:15:38 UTC 2020 - Fabian Vogt + +- Drop baselibs.conf, -32bit packages are not used anywhere and due + to system assimp not providing -32bit packages broken anyway + ------------------------------------------------------------------- Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index 0a3f18f..eec5c0a 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -33,7 +33,6 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz -Source1: baselibs.conf BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version} From 1eef5f3d9a46ecf8c5e48163977bf0ed14629ebf508de9c4c208313913790472 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 15 Dec 2020 08:26:18 +0000 Subject: [PATCH 2/5] osc copypac from project:KDE:Qt:5.15 package:libqt5-qt3d revision:12 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=14 --- baselibs.conf | 12 ++++++++++++ libqt5-qt3d.changes | 6 ------ libqt5-qt3d.spec | 1 + 3 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..06f3745 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,12 @@ +libQt53DCore5 +libQt53DAnimation5 +libQt53DExtras5 +libQt53DInput5 +libQt53DLogic5 +libQt53DQuick5 +libQt53DQuickAnimation5 +libQt53DQuickExtras5 +libQt53DQuickInput5 +libQt53DQuickRender5 +libQt53DQuickScene2D5 +libQt53DRender5 diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index 431f72b..bdde139 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Dec 15 08:15:38 UTC 2020 - Fabian Vogt - -- Drop baselibs.conf, -32bit packages are not used anywhere and due - to system assimp not providing -32bit packages broken anyway - ------------------------------------------------------------------- Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index eec5c0a..0a3f18f 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -33,6 +33,7 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz +Source1: baselibs.conf BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version} From 762f03f23c7061fee2695caa1a31421039a27264040c94435977eb9839a7c3f3 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 15 Dec 2020 08:26:51 +0000 Subject: [PATCH 3/5] - Test installcheck OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=15 --- libqt5-qt3d.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index bdde139..652dbca 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 15 08:24:14 UTC 2020 - Fabian Vogt + +- Test installcheck + ------------------------------------------------------------------- Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt From 7092b3fb5f3b51ba3a4e6c97aba40c33c9a8872e5caaa3269d1705ff8b377d68 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 15 Dec 2020 08:27:32 +0000 Subject: [PATCH 4/5] osc copypac from project:KDE:Qt:5.15 package:libqt5-qt3d revision:13 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=16 --- baselibs.conf | 12 ------------ libqt5-qt3d.changes | 5 +++-- libqt5-qt3d.spec | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 06f3745..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,12 +0,0 @@ -libQt53DCore5 -libQt53DAnimation5 -libQt53DExtras5 -libQt53DInput5 -libQt53DLogic5 -libQt53DQuick5 -libQt53DQuickAnimation5 -libQt53DQuickExtras5 -libQt53DQuickInput5 -libQt53DQuickRender5 -libQt53DQuickScene2D5 -libQt53DRender5 diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index 652dbca..431f72b 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Tue Dec 15 08:24:14 UTC 2020 - Fabian Vogt +Tue Dec 15 08:15:38 UTC 2020 - Fabian Vogt -- Test installcheck +- Drop baselibs.conf, -32bit packages are not used anywhere and due + to system assimp not providing -32bit packages broken anyway ------------------------------------------------------------------- Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index 0a3f18f..eec5c0a 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -33,7 +33,6 @@ License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) Group: Development/Libraries/X11 URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz -Source1: baselibs.conf BuildRequires: fdupes BuildRequires: libQt5Bootstrap-devel-static >= %{version} BuildRequires: libQt5Concurrent-devel >= %{version} From b9b3ed74eb4082e6cc1adfea411b40777959e1f9296261d862a795625acae676 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 15 Dec 2020 08:58:02 +0000 Subject: [PATCH 5/5] - Fix links in %{_bindir} OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qt3d?expand=0&rev=17 --- libqt5-qt3d.changes | 1 + libqt5-qt3d.spec | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libqt5-qt3d.changes b/libqt5-qt3d.changes index 431f72b..2032c60 100644 --- a/libqt5-qt3d.changes +++ b/libqt5-qt3d.changes @@ -3,6 +3,7 @@ Tue Dec 15 08:15:38 UTC 2020 - Fabian Vogt - Drop baselibs.conf, -32bit packages are not used anywhere and due to system assimp not providing -32bit packages broken anyway +- Fix links in %{_bindir} ------------------------------------------------------------------- Fri Nov 20 12:08:42 UTC 2020 - Fabian Vogt diff --git a/libqt5-qt3d.spec b/libqt5-qt3d.spec index eec5c0a..2437dff 100644 --- a/libqt5-qt3d.spec +++ b/libqt5-qt3d.spec @@ -418,8 +418,8 @@ rm -f %{buildroot}%{_libqt5_libdir}/lib*.la mkdir -p %{buildroot}%{_bindir} pushd %{buildroot}%{_libqt5_bindir} for i in * ; do - ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5 - ln -s %{libqt5_bindir}/$i %{buildroot}%{_bindir}/${i} + ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5 + ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i} done popd %endif