rpms/tuxguitar/F-11 tuxguitar-build-fedora.xml, NONE, 1.1 tuxguitar-plugin-properties.patch, NONE, 1.1 tuxguitar.spec, 1.5, 1.6 tuxguitar-Makefile, 1.1, NONE tuxguitar.desktop, 1.2, NONE
Orcan Ogetbil
oget at fedoraproject.org
Thu Dec 10 05:22:53 UTC 2009
- Previous message: rpms/tuxguitar/F-12 tuxguitar-build-fedora.xml, NONE, 1.1 tuxguitar-plugin-properties.patch, NONE, 1.1 tuxguitar.spec, 1.7, 1.8 tuxguitar-Makefile, 1.1, NONE tuxguitar.desktop, 1.3, NONE
- Next message: rpms/ibus/devel ibus.spec,1.96,1.97
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: oget
Update of /cvs/pkgs/rpms/tuxguitar/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19753
Modified Files:
tuxguitar.spec
Added Files:
tuxguitar-build-fedora.xml tuxguitar-plugin-properties.patch
Removed Files:
tuxguitar-Makefile tuxguitar.desktop
Log Message:
* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
- Change build system (we'll use our build-fedora.xml rather than patching Debian's
Makefile).
- Disable system tray and oss plugins by default.
- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
software works out of the box.
--- NEW FILE tuxguitar-build-fedora.xml ---
<?xml version="1.0" encoding="iso-8859-1"?>
<project name="Tux Guitar" basedir="." >
<description>
Tux-Guitar
</description>
<taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property name="file.properties" value="${build.path}${file.separator}config.dist" />
<property name="file.desktop" value="tuxguitar.desktop" />
<property name="file.mime" value="tuxguitar.xml" />
<property name="file.script" value="tuxguitar" />
<property name="file.plugin.properties" value="${build.path}${file.separator}plugin.properties" />
<property name="file.fluidsynth.config" value="${build.path}${file.separator}tuxguitar-fluidsynth.cfg" />
<property name="file.song" value="../misc/tuxguitar.tg" />
<target name="clean" >
<delete quiet="true" dir="tuxguitar-${dist.version}" />
</target>
<target name="package" />
<target name="install" >
<mkdir dir="${dist.dst.path}${os.data.dir}/applications" />
<copy todir="${dist.dst.path}${os.data.dir}/applications/">
<fileset file="${file.desktop}"/>
</copy>
<mkdir dir="${dist.dst.path}${os.data.dir}/mime/packages" />
<copy todir="${dist.dst.path}${os.data.dir}/mime/packages">
<fileset file="${file.mime}"/>
</copy>
<mkdir dir="${dist.dst.path}${os.bin.dir}" />
<exec executable="cp" >
<arg value="-a"/>
<arg value="${file.script}"/>
<arg value="${dist.dst.path}${os.bin.dir}/"/>
</exec>
<copy tofile="${dist.dst.path}${dist.default.song}/" >
<fileset file="${file.song}"/>
</copy>
<for list="16,24,32,48,64,96" param="dim" >
<sequential>
<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/" />
<mkdir dir="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/" />
<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/apps/tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-tuxguitar.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-gtp.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
<symlink link="${dist.dst.path}${os.data.dir}/icons/hicolor/@{dim}x@{dim}/mimetypes/audio-x-ptb.png" resource="../../../../tuxguitar/skins/${dist.default.style}/icon-@{dim}x@{dim}.png" />
</sequential>
</for>
</target>
<target name="build" >
<echo file="${file.properties}" append="false">font.default=Sans,6,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.note=Sans,7,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.text=Sans,8,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.lyric=Sans,7,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.time-signature=Sans,13,1${line.separator}</echo>
<echo file="${file.properties}" append="true">font.printer.default=Sans,6,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.printer.note=Sans,6,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.printer.text=Sans,8,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.printer.lyric=Sans,7,0${line.separator}</echo>
<echo file="${file.properties}" append="true">font.printer.time-signature=Sans,10,1${line.separator}</echo>
<echo file="${file.properties}" append="true">midi.sequencer=tuxguitar.sequencer${line.separator}</echo>
<echo file="${file.properties}" append="true">midi.port=tuxguitar-fluidsynth_${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
<echo file="${file.properties}" append="true">skin=${dist.default.style}${line.separator}</echo>
<echo file="${file.desktop}" append="false">[Desktop Entry]${line.separator}</echo>
<echo file="${file.desktop}" append="true">Version=1.0${line.separator}</echo>
<echo file="${file.desktop}" append="true">Name=TuxGuitar${line.separator}</echo>
<echo file="${file.desktop}" append="true">GenericName=Tablature Editor/Playback${line.separator}</echo>
<echo file="${file.desktop}" append="true">Comment=Edit, playback guitar tablatures${line.separator}</echo>
<echo file="${file.desktop}" append="true">Comment[fr]=Edite, joue des tablatures de guitare${line.separator}</echo>
<echo file="${file.desktop}" append="true">Comment[es]=Edita, reproduce tablaturas de guitarra${line.separator}</echo>
<echo file="${file.desktop}" append="true">Type=Application${line.separator}</echo>
<echo file="${file.desktop}" append="true">MimeType=audio/x-tuxguitar;audio/x-gtp;audio/x-ptb;audio/midi;${line.separator}</echo>
<echo file="${file.desktop}" append="true">Categories=AudioVideo;Audio;X-Notation;${line.separator}</echo>
<echo file="${file.desktop}" append="true">Exec=tuxguitar %f${line.separator}</echo>
<echo file="${file.desktop}" append="true">Icon=tuxguitar${line.separator}</echo>
<echo file="${file.desktop}" append="true">Terminal=false${line.separator}</echo>
<echo file="${file.mime}" append="false"><?xml version="1.0" encoding="UTF-8"?>${line.separator}</echo>
<echo file="${file.mime}" append="true"><mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">${line.separator}</echo>
<echo file="${file.mime}" append="true"> <mime-type type="audio/x-tuxguitar">${line.separator}</echo>
<echo file="${file.mime}" append="true"> <comment>TuxGuitar file</comment>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <glob pattern="*.tg"/>${line.separator}</echo>
<echo file="${file.mime}" append="true"> </mime-type>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <mime-type type="audio/x-gtp">${line.separator}</echo>
<echo file="${file.mime}" append="true"> <comment>GuitarPro file</comment>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <glob pattern="*.gtp"/>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <glob pattern="*.gp3"/>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <glob pattern="*.gp4"/>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <glob pattern="*.gp5"/>${line.separator}</echo>
<echo file="${file.mime}" append="true"> </mime-type>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <mime-type type="audio/x-ptb">${line.separator}</echo>
<echo file="${file.mime}" append="true"> <comment>PowerTab file</comment>${line.separator}</echo>
<echo file="${file.mime}" append="true"> <glob pattern="*.ptb"/>${line.separator}</echo>
<echo file="${file.mime}" append="true"> </mime-type>${line.separator}</echo>
<echo file="${file.mime}" append="true"></mime-info>${line.separator}</echo>
<echo file="${file.script}" append="false">#!/bin/sh${line.separator}</echo>
<echo file="${file.script}" append="true">##SCRIPT DIR${line.separator}</echo>
<echo file="${file.script}" append="true">DIR_NAME=`dirname "$0"`${line.separator}</echo>
<echo file="${file.script}" append="true">DIR_NAME=`cd "$DIR_NAME"; pwd`${line.separator}</echo>
<echo file="${file.script}" append="true">cd "${DIR_NAME}"${line.separator}</echo>
<echo file="${file.script}" append="true">##JAVA${line.separator}</echo>
<echo file="${file.script}" append="true">if [ -z $JAVA ]; then${line.separator}</echo>
<echo file="${file.script}" append="true"> JAVA=${JAVA_HOME}/bin/java${line.separator}</echo>
<echo file="${file.script}" append="true"> [ ! -f ${JAVA} ] && JAVA=/usr/bin/java${line.separator}</echo>
<echo file="${file.script}" append="true"> [ ! -f ${JAVA} ] && JAVA=java${line.separator}</echo>
<echo file="${file.script}" append="true">fi${line.separator}</echo>
<echo file="${file.script}" append="true">##MOZILLA_FIVE_HOME${line.separator}</echo>
<echo file="${file.script}" append="true">if [ -z $MOZILLA_FIVE_HOME ]; then${line.separator}</echo>
<echo file="${file.script}" append="true"> MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/firefox${line.separator}</echo>
<echo file="${file.script}" append="true"> [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/mozilla${line.separator}</echo>
<echo file="${file.script}" append="true"> [ ! -d ${MOZILLA_FIVE_HOME} ] && MOZILLA_FIVE_HOME=/usr/lib${os.lib.suffix}/iceweasel${line.separator}</echo>
<echo file="${file.script}" append="true">fi${line.separator}</echo>
<echo file="${file.script}" append="true">##LIBRARY_PATH${line.separator}</echo>
<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${dist.lib.path}${line.separator}</echo>
<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/lib${os.lib.suffix}${line.separator}</echo>
<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}${line.separator}</echo>
<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/lib${os.lib.suffix}/jni${line.separator}</echo>
<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib${os.lib.suffix}${line.separator}</echo>
<echo file="${file.script}" append="true">LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${MOZILLA_FIVE_HOME}${line.separator}</echo>
<echo file="${file.script}" append="true">##CLASSPATH${line.separator}</echo>
<echo file="${file.script}" append="true">CLASSPATH=$CLASSPATH:${dist.jar.path}${build.jar}:${lib.swt.jar}:${path.itext}:${dist.share.path}${line.separator}</echo>
<echo file="${file.script}" append="true">##MAINCLASS${line.separator}</echo>
<echo file="${file.script}" append="true">MAINCLASS=org.herac.tuxguitar.gui.TGMain${line.separator}</echo>
<echo file="${file.script}" append="true">##JVM ARGUMENTS${line.separator}</echo>
<echo file="${file.script}" append="true">VM_ARGS="-Xmx512m"${line.separator}</echo>
<echo file="${file.script}" append="true">##EXPORT VARS${line.separator}</echo>
<echo file="${file.script}" append="true">export CLASSPATH${line.separator}</echo>
<echo file="${file.script}" append="true">export LD_LIBRARY_PATH${line.separator}</echo>
<echo file="${file.script}" append="true">export MOZILLA_FIVE_HOME${line.separator}</echo>
<echo file="${file.script}" append="true">arg=""${line.separator}</echo>
<echo file="${file.script}" append="true">if [ ! "$1" ] ; then arg="${dist.default.song}"; fi${line.separator}</echo>
<echo file="${file.script}" append="true">##LAUNCH${line.separator}</echo>
<echo file="${file.script}" append="true">${JAVA} ${VM_ARGS} -cp :${CLASSPATH} -Dtuxguitar.share.path="${dist.share.path}" -Djava.library.path="${LD_LIBRARY_PATH}" ${MAINCLASS} "$1" "$2" "$arg"${line.separator}</echo>
<chmod file="${file.script}" perm="755"/>
<echo file="${file.plugin.properties}" append="false">org.herac.tuxguitar.player.impl.midiport.oss.MidiOutputPortProviderPlugin.enabled=false${line.separator}</echo>
<echo file="${file.plugin.properties}" append="true">org.herac.tuxguitar.tray.TGTrayPlugin.enabled=false${line.separator}</echo>
<echo file="${file.fluidsynth.config}" append="false">soundfont.count=1${line.separator}</echo>
<echo file="${file.fluidsynth.config}" append="true">soundfont.path0=${os.data.dir}/soundfonts/default.sf2${line.separator}</echo>
<echo file="${file.fluidsynth.config}" append="true">audio.driver=alsa${line.separator}</echo>
<echo file="${file.fluidsynth.config}" append="true">audio.period-size=1024${line.separator}</echo>
</target>
</project>
tuxguitar-plugin-properties.patch:
TGPluginProperties.java | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
--- NEW FILE tuxguitar-plugin-properties.patch ---
--- trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java 2008/04/24 13:53:06 99
+++ trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java 2009/11/26 13:34:24 770
@@ -7,6 +7,7 @@
package org.herac.tuxguitar.gui.system.plugins;
import java.io.File;
+import java.io.InputStream;
import java.util.Properties;
import org.herac.tuxguitar.gui.system.config.TGConfigManager;
@@ -19,6 +20,8 @@
*/
public class TGPluginProperties extends TGConfigManager{
+ private static final String FILE_NAME = "plugin.properties";
+
private static TGPluginProperties instance;
public static TGPluginProperties instance(){
@@ -38,11 +41,19 @@
}
public String getFileName(){
- return TGFileUtils.PATH_USER_CONFIG + File.separator + "plugin.properties";
+ return TGFileUtils.PATH_USER_CONFIG + File.separator + FILE_NAME;
}
public Properties getDefaults() {
- return new Properties();
+ Properties properties = new Properties();
+ try {
+ InputStream is = TGFileUtils.getResourceAsStream(FILE_NAME);
+ if(is != null){
+ properties.load(is);
+ }
+ } catch (Throwable throwable) {
+ throwable.printStackTrace();
+ }
+ return properties;
}
-
}
\ No newline at end of file
Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-11/tuxguitar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- tuxguitar.spec 14 Nov 2009 06:57:44 -0000 1.5
+++ tuxguitar.spec 10 Dec 2009 05:22:53 -0000 1.6
@@ -1,14 +1,18 @@
-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Summary: A multitrack tablature editor and player written in Java-SWT
Name: tuxguitar
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://www.tuxguitar.com.ar
Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-# For some reason this is missing from the tarball. Downloaded from upstream trunk:
-Source1: %{name}-Makefile
-Source9: %{name}.desktop
+# Fedora specific build script. Accepted by upstream:
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/xml/build-fedora.xml
+Source1: %{name}-build-fedora.xml
+# From upstream trunk, to disable certain plugins by default
+# http://tuxguitar.svn.sourceforge.net/viewvc/tuxguitar/trunk/TuxGuitar/src/org/herac/tuxguitar/gui/system/plugins/TGPluginProperties.java?r1=99&r2=770
+Patch0: %{name}-plugin-properties.patch
+
License: LGPLv2+
Group: Applications/Multimedia
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -17,14 +21,18 @@ Requires: itext
Requires: java >= 1.7
Requires: jpackage-utils
Requires: libswt3-gtk2
+Requires: soundfont2-default
BuildRequires: alsa-lib-devel
BuildRequires: ant
+BuildRequires: ant-contrib
+BuildRequires: ant-nodeps
BuildRequires: itext
BuildRequires: desktop-file-utils
BuildRequires: fluidsynth-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: java-devel >= 1.7
BuildRequires: jpackage-utils
+
BuildRequires: libswt3-gtk2
%if %{with_gcj}
BuildRequires: java-gcj-compat-devel >= 1.0.31
@@ -42,110 +50,96 @@ tempo management, gp3/gp4/gp5 import and
%prep
%setup -q -n %{name}-src-%{version}
+%patch0 -p1
-# Place the Makefile
-cp %{SOURCE1} Makefile
-
-# The following issues were discussed in:
-# http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Declare the library path and classpath during runtime instead
-sed -i 's|env_$|env_\nexport CLASSPATH=%{_libdir}/java/swt.jar\n|' misc/tuxguitar.sh
-sed -i 's|PACKAGE_LIB:=/usr/lib/jni|PACKAGE_LIB:=%{_libdir}/%{name}|' misc/tuxguitar.sh
-# Add exec to replace the called shell
-sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${JAVA} ${JAVA_FLAGS}|' misc/tuxguitar.sh
-
-# Change /lib to %%{_lib}, just in case
-sed -i 's|/lib/|/%{_lib}/|g' Makefile
-sed -i 's|/lib/|/%{_lib}/|g' misc/tuxguitar.sh
-sed -i 's|/lib|/%{_lib}|g' TuxGuitar/xml/build-linux.xml
-# Don't strip the binaries during %%install
-sed -i 's/install -s/install -m 755/g' Makefile
-
-# Enable extra plugins:
-sed -i 's|TuxGuitar-pdf \\|\\\
- TuxGuitar-pdf \\\
- TuxGuitar-browser-ftp \\\
- TuxGuitar-gervill \\|' \
- Makefile
-sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf\.jar|\\\
- \./TuxGuitar-pdf/tuxguitar-pdf\.jar \\\
- \./TuxGuitar-browser-ftp/tuxguitar-browser-ftp\.jar \\\
- \./TuxGuitar-gervill/tuxguitar-gervill\.jar|' \
- Makefile
-sed -i 's|\./TuxGuitar-oss/tuxguitar-oss\.jar|\\\
- \./TuxGuitar-jack/tuxguitar-jack\.jar \\\
- \./TuxGuitar-jack/jni/libtuxguitar-jack-jni\.so \\\
- \./TuxGuitar-oss/tuxguitar-oss\.jar|' \
- Makefile
+cp %{SOURCE1} TuxGuitar/xml/build-fedora.xml
# Set debug="true" on javac part of the build scripts.
for file in $(find . -name build.xml); do
- sed -i 's|debug="false"|debug="true"|' $file
+ sed -i 's|debug="false"|debug="true"|' $file
done
%build
-# Does not compile with %%{?_smp_mflags}. Build using openjdk.
-# SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar \
- CFLAGS="${RPM_OPT_FLAGS} \
- -I%{_jvmdir}/java-openjdk/include \
- -I%{_jvmdir}/java-openjdk/include/linux \
- -fPIC"
+# Plugins to build:
+PLUGINS="alsa ascii browser-ftp community compat converter fluidsynth gervill\
+ gtp jack jsa lilypond midi musicxml oss pdf ptb tef tray"
+
+# JNI's to build
+JNIS="alsa fluidsynth jack oss"
+
+LIBSUFFIX=$(echo %{_lib}|sed 's|lib||')
+
+# to pass to ant:
+ANT_FLAGS=" \
+ -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+ -Dpath.itext=%{_javadir}/itext.jar \
+ -Dpath.swt=%{_libdir}/java/swt.jar \
+ -Dlib.swt.jar=%{_libdir}/java/swt.jar \
+ -Ddist.lib.path=%{_libdir}/%{name}/ \
+ -Ddist.file=xml/build-fedora.xml \
+ -Ddist.jar.path=%{_datadir}/%{name}/ \
+ -Ddist.share.path=%{_datadir}/%{name}/ \
+ -Dos.lib.suffix=$LIBSUFFIX \
+ -Dos.data.dir=%{_datadir}/ \
+ -Ddist.default.style=Lavender \
+ -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg"
+
+# build jars
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS all
+for jarname in $PLUGINS; do
+ ant -f TuxGuitar-$jarname/build.xml -v -d $ANT_FLAGS \
+ -Dbuild.jar=../TuxGuitar/share/plugins/tuxguitar-$jarname.jar all
+done
+
+# build jnis
+for jni in $JNIS; do
+ make -C TuxGuitar-$jni/jni %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS} \
+ -I%{_jvmdir}/java-openjdk/include \
+ -I%{_jvmdir}/java-openjdk/include/linux \
+ -fPIC"
+done
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install
-install -dm 755 $RPM_BUILD_ROOT/%{_libdir}/%{name}
-make DESTDIR=$RPM_BUILD_ROOT INSTALL_LIB_DIR=$RPM_BUILD_ROOT/%_libdir/%name install-linux
-
-# Makefile does not install the plugins by default so install them manually
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins
-
-for jardir in TuxGuitar-*; do
- if [ -e $jardir/*jar ]
- then
- install -m 644 $jardir/*jar $RPM_BUILD_ROOT/%{_datadir}/%{name}/plugins/
- fi
-done
-# icons
-for dim in 16x16 24x24 32x32 48x48 64x64 96x96; do
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/
- install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
- $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/apps/%{name}.png
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-$dim.png \
- $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-%{name}.png
- ln -sf audio-x-%{name}.png \
- $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-gtp.png
- ln -sf audio-x-%{name}.png \
- $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/$dim/mimetypes/audio-x-ptb.png
-done
+# to pass to ant:
+ANT_FLAGS=" \
+ -Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
+ -Ddist.file=xml/build-fedora.xml \
+ -Dos.bin.dir=%{_bindir} \
+ -Ddist.jar.path=%{_datadir}/%{name}/ \
+ -Ddist.share.path=%{_datadir}/%{name}/ \
+ -Dos.lib.suffix=$LIBSUFFIX \
+ -Dos.data.dir=%{_datadir}/ \
+ -Ddist.default.style=Lavender \
+ -Ddist.doc.path=%{_docdir}/%{name}-%{version}/ \
+ -Ddist.default.song=%{_datadir}/%{name}/%{name}.tg \
+ -Ddist.dst.path=$RPM_BUILD_ROOT"
+
+ant -f TuxGuitar/build.xml -v -d $ANT_FLAGS install
+
+# install jnis we built
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
-# desktop files
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE9}
-
-# mime-type file
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/mime/packages
-install -pm 644 misc/%{name}.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/
%if %{with_gcj}
- %{_bindir}/aot-compile-rpm
+ %{_bindir}/aot-compile-rpm
%endif
+%check
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
- %{_bindir}/rebuild-gcj-db
- fi
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+ then
+ %{_bindir}/rebuild-gcj-db
+ fi
%endif
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
update-desktop-database &> /dev/null
@@ -153,14 +147,14 @@ update-mime-database %{_datadir}/mime >
%postun
%if %{with_gcj}
- if [ -x %{_bindir}/rebuild-gcj-db ]
- then
- %{_bindir}/rebuild-gcj-db
- fi
+ if [ -x %{_bindir}/rebuild-gcj-db ]
+ then
+ %{_bindir}/rebuild-gcj-db
+ fi
%endif
if [ $1 -eq 0 ] ; then
- touch --no-create %{_datadir}/icons/hicolor &>/dev/null
- gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
+ touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null
fi
update-desktop-database &> /dev/null
update-mime-database %{_datadir}/mime >& /dev/null ||:
@@ -171,8 +165,7 @@ gtk-update-icon-cache %{_datadir}/icons/
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog LICENSE README COPYING
-
+%{_docdir}/%{name}-%{version}/
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_datadir}/icons/hicolor/*/*/*
@@ -186,6 +179,13 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_bindir}/%{name}
%changelog
+* Sat Nov 28 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-2
+- Change build system (we'll use our build-fedora.xml rather than patching Debian's
+ Makefile).
+- Disable system tray and oss plugins by default.
+- Make fluidsynth/alsa/fluid soundfont combination the default output so that the
+ software works out of the box.
+
* Sat Nov 14 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-1
- New upstream version
--- tuxguitar-Makefile DELETED ---
--- tuxguitar.desktop DELETED ---
- Previous message: rpms/tuxguitar/F-12 tuxguitar-build-fedora.xml, NONE, 1.1 tuxguitar-plugin-properties.patch, NONE, 1.1 tuxguitar.spec, 1.7, 1.8 tuxguitar-Makefile, 1.1, NONE tuxguitar.desktop, 1.3, NONE
- Next message: rpms/ibus/devel ibus.spec,1.96,1.97
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list