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
This commit is contained in:
Fabian Vogt 2019-07-01 11:46:51 +00:00 committed by Git OBS Bridge
parent 403c5b86cd
commit f1a5c04957
3 changed files with 26 additions and 3 deletions

View File

@ -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;
}

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 1 11:18:26 UTC 2019 - Jiri Slaby <jslaby@suse.com>
- 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

View File

@ -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