From e4d57276488c5c5f368b7d731ad72a606c322b2979f69635c5d89488d5a06136 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 4 Jan 2019 17:41:12 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=14 --- musescore-fix_build_parameters.patch | 13 ------------- musescore-fix_prefix.patch | 13 ------------- musescore.changes | 6 ------ musescore.spec | 4 ---- 4 files changed, 36 deletions(-) delete mode 100644 musescore-fix_build_parameters.patch delete mode 100644 musescore-fix_prefix.patch diff --git a/musescore-fix_build_parameters.patch b/musescore-fix_build_parameters.patch deleted file mode 100644 index e28b21e..0000000 --- a/musescore-fix_build_parameters.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: MuseScore-3.0/Makefile -=================================================================== ---- MuseScore-3.0.orig/Makefile -+++ MuseScore-3.0/Makefile -@@ -38,7 +38,7 @@ USE_SYSTEM_FREETYPE="OFF" # Override wit - COVERAGE="OFF" # Override with "ON" to enable. - DOWNLOAD_SOUNDFONT="ON" # Override with "OFF" to disable latest soundfont download. - --UPDATE_CACHE="TRUE"# Override if building a DEB or RPM, or when installing to a non-standard location. -+UPDATE_CACHE="FALSE"# Override if building a DEB or RPM, or when installing to a non-standard location. - NO_RPATH="FALSE"# Package maintainers may want to override this (e.g. Debian) - - # diff --git a/musescore-fix_prefix.patch b/musescore-fix_prefix.patch deleted file mode 100644 index 7b35ec4..0000000 --- a/musescore-fix_prefix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: MuseScore-3.0/Makefile -=================================================================== ---- MuseScore-3.0.orig/Makefile -+++ MuseScore-3.0/Makefile -@@ -20,7 +20,7 @@ - REVISION := `cat mscore/revision.h` - CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || getconf NPROCESSORS_ONLN 2>/dev/null || echo 1) - --PREFIX = "/usr/local" -+PREFIX = "/usr" - #VERSION = "3.0b-${REVISION}" - VERSION = 3.0.0 - BUILD_NUMBER="" diff --git a/musescore.changes b/musescore.changes index 2deadff..ed9a04d 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Jan 4 15:26:32 UTC 2019 - Cor Blom - -- Add musescore-fix_build_parameters.patch and musescore-fix_prefix.patch - to fix build. - ------------------------------------------------------------------- Fri Jan 4 14:35:14 UTC 2019 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 0ed4fdf..2545acd 100644 --- a/musescore.spec +++ b/musescore.spec @@ -34,8 +34,6 @@ Group: Productivity/Multimedia/Sound/Editors and Convertors URL: https://musescore.org Source0: https://github.com/musescore/MuseScore/archive/v%{version_lesser}/MuseScore-%{version_lesser}.tar.gz Source1: %{rname}.desktop -Patch0: %{name}-fix_prefix.patch -Patch1: %{name}-fix_build_parameters.patch BuildRequires: alsa-devel BuildRequires: cmake >= 3.0 BuildRequires: fdupes @@ -77,8 +75,6 @@ Additional fonts for use by the MuseScore music notation program. %prep %setup -q -n MuseScore-%{version_lesser} -%patch0 -p1 -%patch1 -p1 # remove precompiled binary rm thirdparty/rtf2html/rtf2html