diff --git a/download b/download new file mode 100644 index 0000000..17d5d4e Binary files /dev/null and b/download differ diff --git a/tuxguitar-1.3-x86_64-lib64.patch b/tuxguitar-1.3-x86_64-lib64.patch new file mode 100644 index 0000000..7bf7483 --- /dev/null +++ b/tuxguitar-1.3-x86_64-lib64.patch @@ -0,0 +1,11 @@ +--- tuxguitar-1.3.0-src/build-scripts/tuxguitar-linux-gcj/makefiles/tuxguitar-gm-utils.mf.orig 2016-02-03 14:23:30.424221274 +0100 ++++ tuxguitar-1.3.0-src/build-scripts/tuxguitar-linux-gcj/makefiles/tuxguitar-gm-utils.mf 2016-02-03 14:23:46.354217034 +0100 +@@ -17,7 +17,7 @@ + TG_LIB_SOURCE_PATH?=$(TG_LIB_PREFIX)/src + + # install paths +-INSTALL_LIBRARY_DIR?=$(PREFIX)/lib/ext ++INSTALL_LIBRARY_DIR?=$(PREFIX)/lib64/ext + + # build paths + SOURCE_PATH?=$(TG_PROJECT_HOME)/src/ diff --git a/tuxguitar.spec b/tuxguitar.spec index 9410889..0aa3a2d 100644 --- a/tuxguitar.spec +++ b/tuxguitar.spec @@ -1,14 +1,15 @@ Name: tuxguitar -Version: 1.2 -Release: 7mamba +Version: 1.3.0 +Release: 1mamba Summary: A Multitrack tablature editor and player Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: http://tuxguitar.herac.com.ar/ -Source: http://downloads.sourceforge.net/project/tuxguitar/TuxGuitar/TuxGuitar-src-%{version}/tuxguitar-src-%{version}.tar.gz +Source: http://sourceforge.net/projects/tuxguitar/files/TuxGuitar/TuxGuitar-%{version}/tuxguitar-%{version}-src.tar.gz/download Patch0: %{name}-1.2-buildfile_fix.patch +Patch1: tuxguitar-1.3-x86_64-lib64.patch License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: fluidsynth-devel @@ -20,7 +21,7 @@ BuildRequires: libjack-devel BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: libgcj-devel >= 5.2 -BuildRequires: libgcj-devel >= 5.2.255 +#BuildRequires: libgcj-devel <= 5.2.255 BuildRequires: eclipse-swt BuildRequires: java-gcj-compat BuildRequires: libjack-devel @@ -47,31 +48,50 @@ With TuxGuitar, you will be able to compose music using the following features: %debug_package %prep -%setup -q -n tuxguitar-src-%{version} -%patch0 -p1 +%setup -q -n tuxguitar-%{version}-src +#-D -T +#:<< _EOF %ifarch x86_64 -sed -i "s|/usr/lib|%{_libdir}|g" build_gcj.sh +%patch1 -p1 %endif %build -# workaround for builddir dynamic linking -mkdir -p tuxguitar-1.2-linux-x86-gcj -ln -s usr/lib tuxguitar-1.2-linux-x86-gcj/lib -%ifarch x86_64 -export TG_LIBRARY_PATH_JNI=%{_libdir}/jni -%endif -sh ./build_gcj.sh -rm tuxguitar-1.2-linux-x86-gcj/lib +#:<< _EOF +cd build-scripts/tuxguitar-linux-gcj +rm -rf target/tuxguitar-%{version}-linux-gcj + +# Passing GCJ_FLAGS="-fPIC"" fails +make GCJ="gcj -fPIC" \ + PREFIX=%{_prefix} \ + TG_LIBRATH_PATH=%{_libdir} \ + TG_LIBRARY_PATH_EXT=%{_libdir}/ext \ + TG_LIBRARY_PATH_JNI=%{_libdir}/jni + +## workaround for builddir dynamic linking +#mkdir -p tuxguitar-1.2-linux-x86-gcj +#ln -s usr/lib tuxguitar-1.2-linux-x86-gcj/lib +#%ifarch x86_64 +#export TG_LIBRARY_PATH_JNI=%{_libdir}/jni +#%endif +#sh ./build_gcj.sh +#rm tuxguitar-1.2-linux-x86-gcj/lib %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -install -d -m0755 %{buildroot}%{_prefix} -%ifarch x86_64 -mv tuxguitar-%{version}-linux-x86-gcj/usr/lib/* tuxguitar-%{version}-linux-x86-gcj/%{_libdir}/ -rmdir tuxguitar-%{version}-linux-x86-gcj/usr/lib -%endif -cp -a tuxguitar-%{version}-linux-x86-gcj/* %{buildroot} +cd build-scripts/tuxguitar-linux-gcj +install -d %{buildroot} +cp -a target/tuxguitar-1.3.0-linux-gcj/* %{buildroot}/ +#install -d -m0755 %{buildroot}%{_prefix} +%ifarch x86_64 +mv %{buildroot}/usr/lib/libtuxguitar* %{buildroot}/%{_libdir}/ +rm -rf %{buildroot}/usr/lib +%endif +#cp -a tuxguitar-%{version}-linux-x86-gcj/* %{buildroot} + +rm -f %{buildroot}/usr/tuxguitar.sh + +install -d -m0755 %{buildroot}%{_bindir} cat > %{buildroot}%{_bindir}/tuxguitar << _EOF LD_LIBRARY_PATH=%{_libdir}/eclipse tuxguitar.bin _EOF @@ -105,64 +125,29 @@ EOF %{_libdir}/jni/libtuxguitar-jack-jni.so %{_libdir}/jni/libtuxguitar-oss-jni.so %{_libdir}/libtuxguitar.so +%{_libdir}/libtuxguitar-lib.so +%{_libdir}/ext/libtuxguitar-gm-utils.so %dir %{_datadir}/tuxguitar/plugins -%{_datadir}/tuxguitar/plugins/libtuxguitar-alsa.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-alsa -%{_datadir}/tuxguitar/plugins/tuxguitar-alsa/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-ascii.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-ascii -%{_datadir}/tuxguitar/plugins/tuxguitar-ascii/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-community.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-community -%{_datadir}/tuxguitar/plugins/tuxguitar-community/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-compat.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-compat -%{_datadir}/tuxguitar/plugins/tuxguitar-compat/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-converter.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-converter -%{_datadir}/tuxguitar/plugins/tuxguitar-converter/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-fluidsynth.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-fluidsynth -%{_datadir}/tuxguitar/plugins/tuxguitar-fluidsynth/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-gtp.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-gtp -%{_datadir}/tuxguitar/plugins/tuxguitar-gtp/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-jack.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-jack -%{_datadir}/tuxguitar/plugins/tuxguitar-jack/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-lilypond.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-lilypond -%{_datadir}/tuxguitar/plugins/tuxguitar-lilypond/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-midi.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-midi -%{_datadir}/tuxguitar/plugins/tuxguitar-midi/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-musicxml.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-musicxml -%{_datadir}/tuxguitar/plugins/tuxguitar-musicxml/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-oss.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-oss -%{_datadir}/tuxguitar/plugins/tuxguitar-oss/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-ptb.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-ptb -%{_datadir}/tuxguitar/plugins/tuxguitar-ptb/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-tef.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-tef -%{_datadir}/tuxguitar/plugins/tuxguitar-tef/* -%{_datadir}/tuxguitar/plugins/libtuxguitar-tray.so -%dir %{_datadir}/tuxguitar/plugins/tuxguitar-tray -%{_datadir}/tuxguitar/plugins/tuxguitar-tray/* +%{_datadir}/tuxguitar/plugins/* %dir %{_datadir}/tuxguitar/help %{_datadir}/tuxguitar/help/* %dir %{_datadir}/tuxguitar/lang %{_datadir}/tuxguitar/lang/* %dir %{_datadir}/tuxguitar/scales %{_datadir}/tuxguitar/scales/scales.xml +%dir %{_datadir}/tuxguitar/soundfont +%{_datadir}/tuxguitar/soundfont/* %dir %{_datadir}/tuxguitar/skins %{_datadir}/tuxguitar/skins/* +%dir %{_datadir}/tuxguitar/templates +%{_datadir}/tuxguitar/templates/* %dir %{_docdir}/tuxguitar %{_docdir}/tuxguitar/* %changelog +* Fri Jan 29 2016 Silvan Calarco 1.3.0-1mamba +- update to 1.3.0 + * Wed Nov 25 2015 Silvan Calarco 1.2-7mamba - rebuilt with gcc 5.2.0