pool/rosegarden
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 518911 from home:plater

Browse Source 
- 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
This commit is contained in:
Dave Plater 2017-08-26 16:31:52 +00:00 committed by Git OBS Bridge
parent 2221b05760
commit 4c6a86f956
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rosegarden.changes
View File

@ -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 Fri Apr 21 16:32:14 UTC 2017 - davejplater@gmail.com

8
rosegarden.spec
View File

@ -40,7 +40,6 @@ BuildRequires: ladspa-devel
BuildRequires: libjack-devel BuildRequires: libjack-devel
BuildRequires: liblo-devel BuildRequires: liblo-devel
BuildRequires: liblrdf-devel BuildRequires: liblrdf-devel
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Network)
@ -49,9 +48,6 @@ BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Test)
BuildRequires: cmake(Qt5LinguistTools) BuildRequires: cmake(Qt5LinguistTools)
%else
BuildRequires: libqt4-devel >= 4.6.3
%endif
BuildRequires: libsamplerate-devel BuildRequires: libsamplerate-devel
BuildRequires: libsndfile-devel BuildRequires: libsndfile-devel
BuildRequires: lilypond BuildRequires: lilypond
@ -100,12 +96,10 @@ export CXXFLAGS="$CFLAGS"
# Now uses cmake # Now uses cmake
#%%configure --enable-debug --localedir=%%{_datadir}/%%{name}/locale/ #%%configure --enable-debug --localedir=%%{_datadir}/%%{name}/locale/
%cmake \ %cmake \
%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1
-DUSE_QT5:BOOL=ON \ -DUSE_QT5:BOOL=ON \
%endif
-DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/locale/ -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/locale/
make %{?_smp_mflags} make %{?_smp_mflags} ||make %{?_smp_mflags}
%install %install
mkdir -p %{buildroot}%{_datadir}/%{name}/scripts mkdir -p %{buildroot}%{_datadir}/%{name}/scripts