Hello community, here is the log from the commit of package rosegarden for openSUSE:Factory checked in at 2016-03-26 15:25:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rosegarden (Old) and /work/SRC/openSUSE:Factory/.rosegarden.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rosegarden" Changes: -------- --- /work/SRC/openSUSE:Factory/rosegarden/rosegarden.changes 2016-03-07 13:27:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rosegarden.new/rosegarden.changes 2016-03-26 15:25:05.000000000 +0100 @@ -1,0 +2,22 @@ +Mon Mar 21 09:57:14 UTC 2016 - [email protected] + +- Added requires and reccomends for packages needed by rosegarden. + +------------------------------------------------------------------- +Sun Mar 20 06:03:29 UTC 2016 - [email protected] + +- Enable QT5 build for openSUSE:Leap:42.1 +- Remove obsolete Provides for old rosegarden4 and rosegarden-qt4 + +------------------------------------------------------------------- +Sat Mar 19 19:11:21 UTC 2016 - [email protected] + +- make the QT5 switch only In Tumbleweed and future products. + +------------------------------------------------------------------- +Fri Mar 18 16:58:54 UTC 2016 - [email protected] + +- Build against QT5 in openSUSE 13.2 or later +- Only provide rosegarden-qt4 in old products with QT4. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rosegarden.spec ++++++ --- /var/tmp/diff_new_pack.QmeEBh/_old 2016-03-26 15:25:06.000000000 +0100 +++ /var/tmp/diff_new_pack.QmeEBh/_new 2016-03-26 15:25:06.000000000 +0100 @@ -30,7 +30,7 @@ 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,18 @@ 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) +BuildRequires: pkgconfig(Qt5PrintSupport) +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 @@ -52,18 +63,19 @@ BuildRequires: xorg-x11-util-devel BuildRequires: pkgconfig(libxml-2.0) Requires: dssi +Requires: xsynth-dssi Requires: ladspa -Provides: rosegarden-qt4 = %{version} -Provides: rosegarden4 = %{version} -Obsoletes: rosegarden-qt4 < %{version} -Obsoletes: rosegarden4 < %{version} -Icon: rosegarden.xpm -%if 0%{?suse_version} > 1120 +Requires: ladspa-swh-plugins Requires: lilypond -%else -Recommends: lilypond -%endif Requires: jack +Recommends: qsynth +Recommends: fluidsynth-dssi +# 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -85,14 +97,19 @@ #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
