Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package tuxguitar for openSUSE:Factory checked in at 2022-02-22 21:18:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tuxguitar (Old) and /work/SRC/openSUSE:Factory/.tuxguitar.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tuxguitar" Tue Feb 22 21:18:24 2022 rev:7 rq:956685 version:1.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/tuxguitar/tuxguitar.changes 2021-08-01 21:52:01.283208950 +0200 +++ /work/SRC/openSUSE:Factory/.tuxguitar.new.1958/tuxguitar.changes 2022-02-22 21:19:05.206296105 +0100 @@ -1,0 +2,7 @@ +Tue Feb 8 09:42:41 UTC 2022 - Fridrich Strba <[email protected]> + +- Added patch: + * no-fluidsynth.patch + + disable fluidsynth for building on sle12 + +------------------------------------------------------------------- New: ---- no-fluidsynth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tuxguitar.spec ++++++ --- /var/tmp/diff_new_pack.OfLh8K/_old 2022-02-22 21:19:06.170296281 +0100 +++ /var/tmp/diff_new_pack.OfLh8K/_new 2022-02-22 21:19:06.174296283 +0100 @@ -1,7 +1,7 @@ # # spec file for package tuxguitar # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2008-2017 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> # Copyright (c) 2008-2017 Fedora project # @@ -55,14 +55,14 @@ Patch1: no-vst.patch Patch2: tuxguitar-additional-arch.patch Patch3: tuxguitar-startscript.patch -Patch4: tuxguitar-startscript-itext.patch +Patch4: no-fluidsynth.patch +Patch5: tuxguitar-startscript-itext.patch BuildRequires: alsa-devel BuildRequires: ant BuildRequires: ant-contrib BuildRequires: desktop-file-utils BuildRequires: eclipse-swt BuildRequires: fdupes -BuildRequires: fluidsynth-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: java-devel >= 1.7 BuildRequires: javapackages-tools @@ -76,6 +76,9 @@ Requires: eclipse-swt Recommends: snd_sf2 Recommends: timidity +%if 0%{?suse_version} >= 1500 +BuildRequires: fluidsynth-devel +%endif %if %{with itext} BuildRequires: mvn(com.itextpdf.tool:xmlworker) BuildRequires: mvn(com.itextpdf:itextpdf) @@ -106,8 +109,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -%if %{with itext} +%if 0%{?suse_version} < 1500 %patch4 -p1 +%endif +%if %{with itext} +%patch5 -p1 %else %pom_remove_dep -r com.itextpdf:itextpdf %pom_remove_dep -r com.itextpdf.tool:xmlworker @@ -190,7 +196,9 @@ %fdupes -s %{buildroot} ln -sf %{_jnidir}/%{name}/%{name}-alsa.jar %{buildroot}%{_javadir}/%{name}/ +%if 0%{?suse_version} >= 1500 ln -sf %{_jnidir}/%{name}/%{name}-fluidsynth.jar %{buildroot}%{_javadir}/%{name}/ +%endif ln -sf %{_jnidir}/%{name}/%{name}-jack.jar %{buildroot}%{_javadir}/%{name}/ ln -sf %{_jnidir}/%{name}/%{name}-oss.jar %{buildroot}%{_javadir}/%{name}/ @@ -207,7 +215,9 @@ %{_mandir}/man1/%{name}.1%{?ext_man} %{_javadir}/%{name}/tuxguitar-alsa.jar +%if 0%{?suse_version} >= 1500 %{_javadir}/%{name}/tuxguitar-fluidsynth.jar +%endif %{_javadir}/%{name}/tuxguitar-jack.jar %{_javadir}/%{name}/tuxguitar-oss.jar ++++++ no-fluidsynth.patch ++++++ --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-aarch64/pom.xml 2022-02-08 10:12:58.089401187 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-aarch64/pom.xml 2022-02-08 10:21:26.976599342 +0100 @@ -368,7 +368,7 @@ <module>../native-modules/tuxguitar-alsa-linux-aarch64</module> <module>../native-modules/tuxguitar-jack-linux-aarch64</module> <module>../native-modules/tuxguitar-oss-linux-aarch64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-aarch64</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-aarch64</module> --> <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-aarch64</module> --> </modules> @@ -394,9 +394,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-aarch64/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-aarch64/target/build" /> - </copy> + </copy> --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-aarch64/target/build" /> </copy> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-armv6hl/pom.xml 2022-02-08 10:12:58.089401187 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-armv6hl/pom.xml 2022-02-08 10:20:50.176357191 +0100 @@ -340,7 +340,7 @@ <module>../native-modules/tuxguitar-alsa-linux-armv6hl</module> <module>../native-modules/tuxguitar-jack-linux-armv6hl</module> <module>../native-modules/tuxguitar-oss-linux-armv6hl</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-armv6hl</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-armv6hl</module> --> </modules> <build> @@ -365,9 +365,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-armv6hl/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-armv6hl/target/build" /> - </copy> + </copy> --> <chmod file="${project.build.directory}/${project.finalName}/lib/*.so" perm="775" /> <!-- /PLUGINS FILES --> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-armv7hl/pom.xml 2022-02-08 10:12:57.741399010 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-armv7hl/pom.xml 2022-02-08 10:19:14.159754189 +0100 @@ -340,7 +340,7 @@ <module>../native-modules/tuxguitar-alsa-linux-armv7hl</module> <module>../native-modules/tuxguitar-jack-linux-armv7hl</module> <module>../native-modules/tuxguitar-oss-linux-armv7hl</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-armv7hl</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-armv7hl</module> --> </modules> <build> @@ -365,9 +365,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-armv7hl/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-armv7hl/target/build" /> - </copy> + </copy> --> <chmod file="${project.build.directory}/${project.finalName}/lib/*.so" perm="775" /> <!-- /PLUGINS FILES --> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-ppc64/pom.xml 2022-02-08 10:12:58.089401187 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-ppc64/pom.xml 2022-02-08 10:18:03.943314858 +0100 @@ -368,7 +368,7 @@ <module>../native-modules/tuxguitar-alsa-linux-ppc64</module> <module>../native-modules/tuxguitar-jack-linux-ppc64</module> <module>../native-modules/tuxguitar-oss-linux-ppc64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64</module> --> <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-ppc64</module> --> </modules> @@ -394,9 +394,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-ppc64/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-ppc64/target/build" /> - </copy> + </copy> --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-ppc64/target/build" /> </copy> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-ppc64le/pom.xml 2022-02-08 10:12:58.089401187 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-ppc64le/pom.xml 2022-02-08 10:18:29.439474383 +0100 @@ -368,7 +368,7 @@ <module>../native-modules/tuxguitar-alsa-linux-ppc64le</module> <module>../native-modules/tuxguitar-jack-linux-ppc64le</module> <module>../native-modules/tuxguitar-oss-linux-ppc64le</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64le</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-ppc64le</module> --> <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-ppc64le</module> --> </modules> @@ -394,9 +394,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-ppc64le/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-ppc64le/target/build" /> - </copy> + </copy> --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-ppc64le/target/build" /> </copy> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-s390x/pom.xml 2022-02-08 10:12:58.089401187 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-s390x/pom.xml 2022-02-08 10:16:58.518905508 +0100 @@ -368,7 +368,7 @@ <module>../native-modules/tuxguitar-alsa-linux-s390x</module> <module>../native-modules/tuxguitar-jack-linux-s390x</module> <module>../native-modules/tuxguitar-oss-linux-s390x</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-s390x</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-s390x</module> --> <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-s390x</module> --> </modules> @@ -394,9 +394,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-s390x/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-s390x/target/build" /> - </copy> + </copy> --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-s390x/target/build" /> </copy> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86/pom.xml 2022-02-08 10:12:58.085401162 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86/pom.xml 2022-02-08 10:15:06.150202438 +0100 @@ -371,7 +371,7 @@ <module>../native-modules/tuxguitar-alsa-linux-x86</module> <module>../native-modules/tuxguitar-jack-linux-x86</module> <module>../native-modules/tuxguitar-oss-linux-x86</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-x86</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-x86</module> --> <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-x86</module> --> </modules> @@ -397,9 +397,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-x86/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86/target/build" /> - </copy> + </copy> --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-x86/target/build" /> </copy> --- tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86_64/pom.xml 2022-02-08 10:12:57.741399010 +0100 +++ tuxguitar-1.5.4-src/build-scripts/tuxguitar-linux-x86_64/pom.xml 2022-02-08 10:22:23.008968043 +0100 @@ -371,7 +371,7 @@ <module>../native-modules/tuxguitar-alsa-linux-x86_64</module> <module>../native-modules/tuxguitar-jack-linux-x86_64</module> <module>../native-modules/tuxguitar-oss-linux-x86_64</module> - <module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module> + <!-- <module>../native-modules/tuxguitar-fluidsynth-linux-x86_64</module> --> <!-- <module>../native-modules/tuxguitar-synth-vst-remote-linux-x86_64</module> --> </modules> @@ -397,9 +397,9 @@ <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-oss-linux-x86_64/target/build" /> </copy> - <copy todir="${project.build.directory}/${project.finalName}/"> + <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-fluidsynth-linux-x86_64/target/build" /> - </copy> + </copy> --> <!-- <copy todir="${project.build.directory}/${project.finalName}/"> <fileset dir="../native-modules/tuxguitar-synth-vst-remote-linux-x86_64/target/build" /> </copy>
