diff --git a/musescore.spec b/musescore.spec index cb1c3ca..5c1aea5 100644 --- a/musescore.spec +++ b/musescore.spec @@ -34,6 +34,8 @@ Source0: https://github.com/musescore/MuseScore/archive/v%{version}/MuseS Source1: %{rname}.desktop # PATCH-FIX-UPSTREAM: see https://github.com/musescore/MuseScore/releases Patch0: correct-revision.patch +# PATCH-FIX-OPENSUSE: really use qmake-qt5 +Patch1: use-qtmake-qt5.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ @@ -97,6 +99,7 @@ Additional fonts for use by the MuseScore music notation program. %prep %setup -q -n MuseScore-%{version} %patch0 -p1 +%patch1 -p1 # fix EOL encoding sed 's/\r$//' fonts/bravura/OFL-FAQ.txt > tmpfile diff --git a/use-qtmake-qt5.patch b/use-qtmake-qt5.patch new file mode 100644 index 0000000..f591080 --- /dev/null +++ b/use-qtmake-qt5.patch @@ -0,0 +1,12 @@ +diff -ur a/build/FindQt5.cmake b/build/FindQt5.cmake +--- a/build/FindQt5.cmake 2019-11-14 08:45:52.000000000 +0100 ++++ b/build/FindQt5.cmake 2019-11-15 10:58:45.208000000 +0100 +@@ -37,7 +37,7 @@ + + include_directories(${QT_INCLUDES}) + +-find_program(QT_QMAKE_EXECUTABLE qmake) ++find_program(QT_QMAKE_EXECUTABLE qmake-qt5) + set(_qmake_vars + QT_INSTALL_ARCHDATA + QT_INSTALL_BINS