From 8d8f01eff5037ca684d17807f33406430f465a96e78c76fce17bf1fcea4b54c6 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Sun, 20 Mar 2016 07:00:38 +0000 Subject: [PATCH] Accepting request 375873 from home:plater Enable qt5 build for Leap and Tumbleweed OBS-URL: https://build.opensuse.org/request/show/375873 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/rosegarden?expand=0&rev=65 --- rosegarden.changes | 5 +++++ rosegarden.spec | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/rosegarden.changes b/rosegarden.changes index 57c23f4..35bdfe3 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 20 06:03:29 UTC 2016 - davejplater@gmail.com + +- Enable QT5 build for openSUSE:Leap:42.1 + ------------------------------------------------------------------- Sat Mar 19 19:11:21 UTC 2016 - crrodriguez@opensuse.org diff --git a/rosegarden.spec b/rosegarden.spec index 62d0a37..50649f7 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -30,7 +30,7 @@ Source2: %{name}.1 Patch1: rosegarden-10.10-filepaths.patch Patch2: rosegarden-14.02-fix-bashisms.patch BuildRequires: alsa-devel -BuildRequires: cmake +BuildRequires: cmake >= 2.8.12 BuildRequires: dssi-devel BuildRequires: fdupes BuildRequires: fftw3-devel @@ -40,7 +40,7 @@ BuildRequires: ladspa-devel BuildRequires: libjack-devel BuildRequires: liblo-devel BuildRequires: liblrdf-devel -%if 0%{?suse_version} > 1320 +%if 0%{?suse_version} > 1320 || 0%{?is_opensuse} == 1 BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) @@ -51,8 +51,6 @@ BuildRequires: pkgconfig(Qt5Test) BuildRequires: cmake(Qt5LinguistTools) %else BuildRequires: libqt4-devel >= 4.6.3 -Provides: rosegarden-qt4 = %{version} -Obsoletes: rosegarden-qt4 < %{version} %endif BuildRequires: libsamplerate-devel BuildRequires: libsndfile-devel @@ -66,6 +64,9 @@ BuildRequires: xorg-x11-util-devel BuildRequires: pkgconfig(libxml-2.0) Requires: dssi Requires: ladspa +# This is old, rosegarden was a kde3 app called rosegarden4 and it's first qt4 version had the qt4 suffix. +Provides: rosegarden-qt4 = %{version} +Obsoletes: rosegarden-qt4 < %{version} Provides: rosegarden4 = %{version} Obsoletes: rosegarden4 < %{version} Icon: rosegarden.xpm @@ -96,14 +97,19 @@ See the changelog for details. #sh bootstrap.sh %build -export DEBUG_LADSPA -export QTDIR=/usr/ +#export DEBUG_LADSPA +#export QTDIR=/usr/ export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb" export CXXFLAGS="$CFLAGS" # -fmessage-length=0 -O2 -fno-strict-aliasing -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables # Now uses cmake #%%configure --enable-debug --localedir=%%{_datadir}/%%{name}/locale/ -%cmake -DCMAKE_INSTALL_LOCALEDIR:PATH=%{_datadir}/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} %install