diff --git a/rosegarden-14.02-fix-bashisms.patch b/rosegarden-14.02-fix-bashisms.patch new file mode 100644 index 0000000..1c22063 --- /dev/null +++ b/rosegarden-14.02-fix-bashisms.patch @@ -0,0 +1,86 @@ +diff -Ndur rosegarden-14.02/scripts/distclean.sh rosegarden-14.02-fix-bashisms/scripts/distclean.sh +--- rosegarden-14.02/scripts/distclean.sh 2014-03-03 13:58:44.000000000 +0200 ++++ rosegarden-14.02-fix-bashisms/scripts/distclean.sh 2014-11-29 04:16:27.094140542 +0200 +@@ -1,12 +1,10 @@ + #!/bin/sh +-rm -f {,src/,po/,docs/,data/}CMakeCache.txt +-rm -f {,src/,po/,docs/,data/}cmake_install.cmake +-rm -f {,src/,po/,docs/,data/}cmake_uninstall.cmake +-rm -f {,src/,po/,docs/,data/}CPackConfig.cmake +-rm -f {,src/,po/,docs/,data/}CPackSourceConfig.cmake +-rm -f {,src/,po/,docs/,data/}install_manifest.txt +-rm -f {,src/,po/,docs/,data/}progress.make +-rm -f {,src/,po/,docs/,data/}Makefile +-rm -rf {,src/,po/,docs/,data/}CMakeFiles +-rm -rf {,src/,po/,docs/,data/}_CPack_Packages ++for d in . src po docs data; do ++ for f in CMakeCache.txt cmake_install.cmake cmake_uninstall.cmake CPackConfig.cmake CPackSourceConfig.cmake install_manifest.txt progress.make Makefile; do ++ rm -f $d/$f ++ done ++ for f in CMakeFiles _CPack_Packages; do ++ rm -rf $d/$f ++ done ++done + rm -rf RGbuild/* +diff -Ndur rosegarden-14.02/scripts/reorganise.sh rosegarden-14.02-fix-bashisms/scripts/reorganise.sh +--- rosegarden-14.02/scripts/reorganise.sh 2014-03-03 13:58:44.000000000 +0200 ++++ rosegarden-14.02-fix-bashisms/scripts/reorganise.sh 2014-11-29 04:21:14.766121081 +0200 +@@ -585,7 +585,7 @@ + fi + fi + done +-mv guitar/*.{cpp,h} $g/editors/guitar/ ++mv guitar/*.cpp guitar/*.h $g/editors/guitar/ + + cd ../src + +@@ -601,21 +601,25 @@ + perlcommand="s/$before/$after/g ; $perlcommand" + done + +-for file in */*.{cpp,h} */*/*.{cpp,h} */*/*/*.{cpp,h}; do +- perl -i -p -e "$perlcommand" $file ++for e in cpp h; do ++ for file in */*.$e */*/*.$e */*/*/*.$e; do ++ perl -i -p -e "$perlcommand" $file ++ done + done + + echo Adding headers at `date`... 1>&2 + +-for x in {base,sound,sequencer}/*.h ; do +- egrep "^class [A-Za-z_0-9][^:;]*" $x | \ +- grep -v ';' | \ +- sed -e 's/^class //' -e 's/[:;{ $class_header_cache + + for hfile in $candidate_h ; do +@@ -788,8 +792,10 @@ + + echo Formatting at `date`... 1>&2 + +-for file in */*.{cpp,h} */*/*.{cpp,h} */*/*/*.{cpp,h} ; do +- perl -i -p -e 's,^//(inc|dec|ndec|replacement_candidate)!,,' $file ++for e in cpp h; do ++ for file in */*.$e */*/*.$e */*/*/*.$e ; do ++ perl -i -p -e 's,^//(inc|dec|ndec|replacement_candidate)!,,' $file ++ done + done + + for file in */*.cpp */*/*.cpp */*/*/*.cpp ; do diff --git a/rosegarden.changes b/rosegarden.changes index 576785b..c3c31c6 100644 --- a/rosegarden.changes +++ b/rosegarden.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Nov 29 02:23:00 UTC 2014 - Led + +- fix bashisms in scripts +- add patches: + * rosegarden-14.02-fix-bashisms.patch + ------------------------------------------------------------------- Fri Sep 19 12:28:37 UTC 2014 - davejplater@gmail.com diff --git a/rosegarden.spec b/rosegarden.spec index b1a7ef4..aec2d7c 100644 --- a/rosegarden.spec +++ b/rosegarden.spec @@ -28,6 +28,7 @@ Source1: %{name}.xpm Source2: %{name}.1 # This patch fixes the file search paths for examples, templates and midi driver libraries. Patch1: rosegarden-10.10-filepaths.patch +Patch2: rosegarden-14.02-fix-bashisms.patch BuildRequires: alsa-devel BuildRequires: automake BuildRequires: dssi-devel @@ -78,6 +79,7 @@ See the changelog for details. %prep %setup -q %patch1 +%patch2 -p1 # When we build svn we need to execute bootstrap.sh it doesn't harm the release build either. sh bootstrap.sh