From f1a5c04957f1401f0d39cc78162537383fcfb6267d25341ddcb7098444237dcf Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 1 Jul 2019 11:46:51 +0000 Subject: [PATCH] Accepting request 712815 from home:jirislaby:branches:openSUSE:Factory - add fix-for-opensuse-lrelease-qt5.patch Fixes build of other projects as our lrelease is called lrelease-qt5. OBS-URL: https://build.opensuse.org/request/show/712815 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=9 --- fix-for-opensuse-lrelease-qt5.patch | 14 ++++++++++++++ libqt5-qttools.changes | 6 ++++++ libqt5-qttools.spec | 9 ++++++--- 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 fix-for-opensuse-lrelease-qt5.patch diff --git a/fix-for-opensuse-lrelease-qt5.patch b/fix-for-opensuse-lrelease-qt5.patch new file mode 100644 index 0000000..e2f202b --- /dev/null +++ b/fix-for-opensuse-lrelease-qt5.patch @@ -0,0 +1,14 @@ +--- + src/linguist/lrelease-pro/main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/src/linguist/lrelease-pro/main.cpp ++++ b/src/linguist/lrelease-pro/main.cpp +@@ -145,6 +145,6 @@ int main(int argc, char **argv) + projectDescription->setAutoRemove(false); + lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName(); + +- runQtTool(QStringLiteral("lrelease"), lreleaseOptions); ++ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions); + return 0; + } diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index 75fd6a2..bb862ca 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 1 11:18:26 UTC 2019 - Jiri Slaby + +- add fix-for-opensuse-lrelease-qt5.patch + Fixes build of other projects as our lrelease is called lrelease-qt5. + ------------------------------------------------------------------- Wed Jun 19 11:24:38 UTC 2019 - fabian@ritter-vogt.de diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index f8bab11..5b76f5f 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -1,7 +1,7 @@ # # spec file for package libqt5-qttools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %if 0%{?suse_version} >= 1330 %bcond_without qdoc %else @@ -28,7 +29,7 @@ Name: libqt5-qttools Version: 5.13.0 Release: 0 Summary: Qt 5 QtTools Module -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only +License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only Group: Development/Libraries/X11 Url: https://www.qt.io %define base_name libqt5 @@ -44,6 +45,8 @@ Source14: qdbusviewer5.desktop Source99: libqt5-qttools-rpmlintrc # PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994@gmail.com Patch0: fix-for-opensuse-qmake-qt5.patch +# PATCH-FIX-OPENSUSE fix-for-opensuse-lrelease-qt5.patch jslaby@suse.cz +Patch1: fix-for-opensuse-lrelease-qt5.patch BuildRequires: fdupes %if %{with qdoc} BuildRequires: clang-devel >= 3.9.0