diff --git a/rosegarden-17.04.tar.bz2 b/rosegarden-17.04.tar.bz2 deleted file mode 100644 index bac4a4d..0000000 --- a/rosegarden-17.04.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:988a6141c5b0a8e85c029f650de78bf57100c4d778c22d0194b0692584640ece -size 6454603 diff --git a/rosegarden-17.12.tar.bz2 b/rosegarden-17.12.tar.bz2 new file mode 100644 index 0000000..657b4fd --- /dev/null +++ b/rosegarden-17.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26592aca205063d62e847840f0a82cfd5093e0ccc10df63853b794c7bdeb2390 +size 6762684 diff --git a/rosegarden.changes b/rosegarden.changes index b290e69..9eda186 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,40 @@ +------------------------------------------------------------------- +Fri Jan 19 13:19:44 UTC 2018 - davejplater@gmail.com + +- Update to release 17.12 and removed incorporated svnheader.patch +- Upstream changes: + *Bug Fixes + Fix progress dialog lockups in KDE (bug #1546) + Fix disappearing lyrics in lyrics editor (bug #1547) + Fix bug #1548: Last syllable of lyrics is not copied between + two linked segments. + Fix bug #1550: Crash with lyric editor and linked segments + Fix bug #1551: No sound from an audio file when pressing rewind + then play. + Fix bug #1549: Matrix Editor: Velocity ruler not updated + correctly when changing velocity using the velocity tool + Fix alias change not updating label on the audio instrument + parameters. + Fix miscellaneous cosmetic issues related to the ThornStyle + upgrade. + Fix time mode toolbar buttons on the Event List and other windows. + Fix incorrect window titles on the preferences and document + properties windows. + Fix garbage property names in Event Edit window. + Display velocities modified from the velocity ruler in the + status bar for the notation editor. + Fix bug #1552: Rosegarden fails to build with cmake-3.9.0. + Fix crash when launching plugin dialog introduced by r14648. + Fix external controller audio volume/pan bug + Fix crash in rulers when pressing mouse buttons + Export to LilyPond as a repeat sequence several consecutive + linked segments is now possible (bug #1470) + Fix duplicate connection in initial autoload + Fix crash when exporting to LilyPond. (bug #1553 + Fix lilypond options dialog too big. + *New Features + Add “Use track name for new segments” preference. + ------------------------------------------------------------------- Sat Aug 26 15:31:47 UTC 2017 - davejplater@gmail.com diff --git a/rosegarden.spec b/rosegarden.spec index b1ef5e4..4c3bd6c 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -16,7 +16,7 @@ # Name: rosegarden -Version: 17.04 +Version: 17.12 Release: 0 License: GPL-2.0+ Summary: Midi, Audio And Notation Editor @@ -29,8 +29,6 @@ Source2: %{name}.1 Patch1: rosegarden-10.10-filepaths.patch # PATCH-FIX-OPENSUSE ledest@gmail.com fix bashisms in scripts Patch2: rosegarden-14.02-fix-bashisms.patch -# PATCH-FIX-UPSTREAM see header - Fix cmake-3.9.0 build failure -Patch3: svnheader.patch BuildRequires: alsa-devel BuildRequires: cmake >= 2.8.12 BuildRequires: dssi-devel @@ -86,7 +84,6 @@ See the changelog for details. %setup -q %patch1 %patch2 -%patch3 -p1 # When we build svn we need to execute bootstrap.sh #sh bootstrap.sh @@ -123,10 +120,11 @@ chmod 644 %{buildroot}%{_datadir}/%{name}/scripts/README chmod 644 %{buildroot}%{_datadir}/%{name}/scripts/color-list #chmod 644 %%{buildroot}%%{_datadir}/%%{name}/scripts/simple-makefile rm -f %{buildroot}%{_datadir}/%{name}/scripts/svn-to-hg-and-git.sh - - +pushd %{buildroot}%{_datadir}/%{name}/scripts +sed -i '1s/^#!.*/#!\/usr\/bin\/python/' sf2rg.py +popd install -D -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/pixmaps/%{name}.xpm" -%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/%{name}.desktop +%suse_update_desktop_file %{buildroot}/%{_datadir}/applications/com.rosegardenmusic.%{name}.desktop #This is a man page made by help2man to satisfy factories hunger for one /usr/bin/ one man page. mkdir -p %{buildroot}%{_mandir}/man1 install -D -m 0644 "%{SOURCE2}" "%{buildroot}%{_mandir}/man1/" @@ -146,7 +144,7 @@ rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS COPYING README -%dir %{_datadir}/appdata +%dir %{_datadir}/metainfo %dir %{_datadir}/%{name}/ %dir %{_datadir}/%{name}/autoload %dir %{_datadir}/%{name}/chords @@ -161,7 +159,8 @@ rm -rf %{buildroot} %dir %{_datadir}/%{name}/templates %{_datadir}/icons/hicolor/* %{_datadir}/pixmaps/%{name}.xpm -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/com.rosegardenmusic.%{name}.desktop +%{_datadir}/metainfo/%{name}.appdata.xml %{_bindir}/%{name} %{_mandir}/man1/* %{_datadir}/%{name}/* @@ -178,6 +177,5 @@ rm -rf %{buildroot} %{_datadir}/%{name}/styles/* %{_datadir}/%{name}/templates/* %{_datadir}/mime/packages/%{name}.xml -%{_datadir}/appdata/rosegarden.appdata.xml %changelog diff --git a/svnheader.patch b/svnheader.patch deleted file mode 100644 index c45bef2..0000000 --- a/svnheader.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: fix svnversion.h dependency to permit parallel building - With CMake 3.9.1 and parallel building enabled, the incorrect specification - of the output filename when creating svnversion.h can lead to a race condition - such that the package fails to build. -Author: Stuart Prescott -Bug: https://sourceforge.net/p/rosegarden/bugs/1552/ -Bug-Debian: https://bugs.debian.org/871213 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -810,7 +810,7 @@ - add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string - - # creates svnheader.h using cmake script --add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h -+add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h - COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} - -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake) -