Hello community, here is the log from the commit of package rosegarden4 for openSUSE:Factory checked in at Mon Apr 26 23:52:43 CEST 2010. -------- --- rosegarden4/rosegarden4.changes 2010-04-05 15:04:11.000000000 +0200 +++ rosegarden4/rosegarden4.changes 2010-04-26 12:49:01.000000000 +0200 @@ -1,0 +2,24 @@ +Sun Apr 25 07:52:46 UTC 2010 - davejplater@gmail.com + +- Update to 10.04 release, removed rosegarden4rpmlintrc and clean up + spec file. +- Fixes bnc#571481 +- This is a bug fix release :- + * Fixes to crashes and incorrect updating in the notation editor + * Restore duration-change shortcuts in notation forgotten in 10.02 + * Various small efficiency improvements + * Fixes to LIRC support + * Fixed to configure process to permit user override of CXXFLAGS + and improve platform compatibility + * Minor improvements to desktop file definition + +------------------------------------------------------------------- +Sun Apr 11 09:12:07 UTC 2010 - davejplater@gmail.com + +- Update to rosegarden-10.04, removed patches due to upstream fix :- + rosegarden-10.02-desktop.patch, rosegarden-10.02-rpmoptflags.patch + Updated patch rosegarden-10.02-filepaths.patch to + rosegarden-10.04-filepaths.patch due to source changes. +- Now at svn revision 11865 snapshot. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rosegarden-10.02-desktop.patch rosegarden-10.02-filepaths.patch rosegarden-10.02-rpmoptflags.patch rosegarden-10.02.tar.bz2 rosegarden4rpmlintrc New: ---- rosegarden-10.04-filepaths.patch rosegarden-10.04.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rosegarden4.spec ++++++ --- /var/tmp/diff_new_pack.NkRx8r/_old 2010-04-26 23:51:54.000000000 +0200 +++ /var/tmp/diff_new_pack.NkRx8r/_new 2010-04-26 23:51:54.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rosegarden4 (Version 10.02) +# spec file for package rosegarden4 (Version 10.04) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,19 +24,15 @@ BuildRequires: alsa-devel dssi-devel fftw3-devel ladspa-devel liblrdf-devel libxml2-devel lirc-devel BuildRequires: libsamplerate-devel libsndfile-devel BuildRequires: fdupes liblo-devel shared-mime-info update-desktop-files -Version: 10.02 -Release: 3 +Version: 10.04 +Release: 1 License: GPLv2+ -Source: rosegarden-%{version}.tar.bz2 -#Source1: rosegarden.desktop -Source2: rosegarden.xpm -# See bnc #574650 for an explanation of rosegarden4rpmlintrc -Source4: rosegarden4rpmlintrc -Patch0: rosegarden-10.02-rpmoptflags.patch -Patch1: rosegarden-10.02-plugin-lib64path.patch -# This patch enables rosegarden.desktop to pass the desktop-file-validate test -Patch2: rosegarden-10.02-desktop.patch -Patch3: rosegarden-10.02-filepaths.patch +Source0: http://kent.dl.sourceforge.net/project/rosegarden/rosegarden/%{version}/rosegarden-%{version}.tar.bz2 +Source1: rosegarden.xpm +# This patch fixes the 64 bit lib search path for dssi and ladspa and is distro specific for now. +Patch0: rosegarden-10.02-plugin-lib64path.patch +# This patch fixes the file search paths for examples, templates and midi import libraries. +Patch1: rosegarden-%{version}-filepaths.patch Group: Productivity/Multimedia/Sound/Midi Summary: Midi, audio and notation editor Icon: rosegarden.xpm @@ -44,12 +40,13 @@ AutoReqProv: on Provides: rosegarden-qt4 = %{version}-%{release} Obsoletes: rosegarden-qt4 < %{version}-%{release} -Requires: ladspa -%if %suse_version > 1120 +Requires: ladspa dssi +%if 0%{?suse_version} > 1120 Requires: lilypond %else Recommends: lilypond %endif +Recommends: jack BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,17 +70,16 @@ %prep %setup -q -n rosegarden-%{version} %patch0 -%patch1 -%patch2 -%patch3 +%patch1 -p 1 sh bootstrap.sh %{?suse_update_config:%{suse_update_config -f}} %build export DEBUG_LADSPA export QTDIR=/usr/ -export CFLAGS="-fmessage-length=0 -O2 -fno-strict-aliasing -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -ggdb" +export CFLAGS="%{optflags} -ggdb" export CXXFLAGS="$CFLAGS" +# -fmessage-length=0 -O2 -fno-strict-aliasing -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables #sh bootstrap.sh %configure --enable-debug --localedir=%{_datadir}/rosegarden/locale/ %__make %{?jobs:-j%{jobs}} @@ -95,13 +91,12 @@ %install mkdir -p %{buildroot}%{_datadir}/rosegarden/scripts cp -p scripts/* %{buildroot}%{_datadir}/rosegarden/scripts/ +cp -r data/* %{buildroot}%{_datadir}/rosegarden/ make DESTDIR=%buildroot install -cp -r data/* %{buildroot}%{_datadir}/rosegarden/ -#mkdir %{buildroot} #rm -f %{buildroot}%{_datadir}/rosegarden/locale/*.ts rm -rf %{buildroot}%{_datadir}/rosegarden/desktop -rm -rf %{buildroot}%{_datadir}/rosegarden/r* +#rm -rf %{buildroot}%{_datadir}/rosegarden/pixmaps/ rm -rf %{buildroot}%{_datadir}/rosegarden/mime rm -f %{buildroot}%{_datadir}/rosegarden/*.cpp rm -f %{buildroot}%{_datadir}/rosegarden/*.o @@ -111,12 +106,11 @@ chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/color-list chmod 644 %{buildroot}%{_datadir}/rosegarden/scripts/simple-makefile -%__install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/pixmaps/rosegarden.xpm" +%__install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/pixmaps/rosegarden.xpm" %suse_update_desktop_file %{buildroot}/%{_datadir}/applications/rosegarden.desktop #This is a workaround to fix bnc#549870 install rosegarden wrapper script # %__install -D -m 0755 "%{SOURCE4}" "%{buildroot}%{_bindir}/rosegarden" %fdupes -s $RPM_BUILD_ROOT%{_datadir}/ -#cp %post /usr/bin/update-mime-database "%{_datadir}/mime" >/dev/null ++++++ rosegarden-10.02-filepaths.patch -> rosegarden-10.04-filepaths.patch ++++++ --- rosegarden4/rosegarden-10.02-filepaths.patch 2010-04-03 18:23:01.000000000 +0200 +++ rosegarden4/rosegarden-10.04-filepaths.patch 2010-04-11 11:11:38.000000000 +0200 @@ -1,7 +1,7 @@ -Index: rosegarden-10.02/src/gui/widgets/FileDialog.cpp +Index: rosegarden-10.04/src/gui/widgets/FileDialog.cpp =================================================================== ---- src/gui/widgets/FileDialog.cpp -+++ src/gui/widgets/FileDialog.cpp +--- rosegarden-10.04.orig/src/gui/widgets/FileDialog.cpp ++++ rosegarden-10.04/src/gui/widgets/FileDialog.cpp @@ -47,8 +47,8 @@ FileDialog::FileDialog(QWidget *parent, QList<QUrl> urls; @@ -13,10 +13,10 @@ QString rosegarden = home + "/rosegarden"; RG_DEBUG << "FileDialog::FileDialog(...)" << endl -Index: rosegarden-10.02/src/gui/studio/BankEditorDialog.cpp +Index: rosegarden-10.04/src/gui/studio/BankEditorDialog.cpp =================================================================== ---- src/gui/studio/BankEditorDialog.cpp -+++ src/gui/studio/BankEditorDialog.cpp +--- rosegarden-10.04.orig/src/gui/studio/BankEditorDialog.cpp ++++ rosegarden-10.04/src/gui/studio/BankEditorDialog.cpp @@ -1554,7 +1554,7 @@ void BankEditorDialog::slotImport() { ++++++ rosegarden-10.02.tar.bz2 -> rosegarden-10.04.tar.bz2 ++++++ ++++ 519796 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org