From 4c6a86f95653918c5fc9640480b1a837712e68280a93c8ebae48cc27d51b2e72 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sat, 26 Aug 2017 16:31:52 +0000 Subject: [PATCH] Accepting request 518911 from home:plater - Work around strange build problem introduced by cmake-3.9.0 by restarting make on first failure. OBS-URL: https://build.opensuse.org/request/show/518911 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=73 --- rosegarden.changes | 6 ++++++ rosegarden.spec | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rosegarden.changes b/rosegarden.changes index a05b801..bd014d0 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Aug 26 15:31:47 UTC 2017 - davejplater@gmail.com + +- Work around strange build problem introduced by cmake-3.9.0 by + restarting make on first failure. + ------------------------------------------------------------------- Fri Apr 21 16:32:14 UTC 2017 - davejplater@gmail.com diff --git a/rosegarden.spec b/rosegarden.spec index f7a42f0..2b76d38 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -40,7 +40,6 @@ BuildRequires: ladspa-devel BuildRequires: libjack-devel BuildRequires: liblo-devel BuildRequires: liblrdf-devel -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) @@ -49,9 +48,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Test) BuildRequires: cmake(Qt5LinguistTools) -%else -BuildRequires: libqt4-devel >= 4.6.3 -%endif BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel BuildRequires: lilypond @@ -100,12 +96,10 @@ export CXXFLAGS="$CFLAGS" # Now uses cmake #%%configure --enable-debug --localedir=%%{_datadir}/%%{name}/locale/ %cmake \ -%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 -DUSE_QT5:BOOL=ON \ -%endif -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/locale/ -make %{?_smp_mflags} +make %{?_smp_mflags} ||make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_datadir}/%{name}/scripts