rpms/tuxguitar/devel tuxguitar-Makefile, NONE, 1.1 tuxguitar.desktop, 1.2, 1.3 tuxguitar.spec, 1.6, 1.7

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/tuxguitar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6804

Modified Files:
	tuxguitar.desktop tuxguitar.spec 
Added Files:
	tuxguitar-Makefile 
Log Message:
* Sat Nov 14 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-1
- New upstream version



***** Error reading new file: [Errno 2] No such file or directory: 'tuxguitar-Makefile'

Index: tuxguitar.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/tuxguitar.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- tuxguitar.desktop	6 Aug 2009 03:28:29 -0000	1.2
+++ tuxguitar.desktop	14 Nov 2009 06:48:26 -0000	1.3
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Version=1.0
-Encoding=UTF-8
 GenericName=Tablature Editor/Playback
 Name=TuxGuitar
 Comment=Edit, playback guitar tablatures


Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/devel/tuxguitar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- tuxguitar.spec	6 Aug 2009 03:28:29 -0000	1.6
+++ tuxguitar.spec	14 Nov 2009 06:48:26 -0000	1.7
@@ -2,10 +2,12 @@
 
 Summary:          A multitrack tablature editor and player written in Java-SWT
 Name:             tuxguitar
-Version:          1.1
-Release:          3%{?dist}
+Version:          1.2
+Release:          1%{?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
 License:          LGPLv2+
 Group:            Applications/Multimedia
@@ -20,6 +22,7 @@ BuildRequires:    ant
 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
@@ -40,6 +43,9 @@ tempo management, gp3/gp4/gp5 import and
 %prep
 %setup -q -n %{name}-src-%{version}
 
+# 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
@@ -51,7 +57,7 @@ sed -i 's|${JAVA} ${JAVA_FLAGS}|exec ${J
 # 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
+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
 
@@ -66,7 +72,11 @@ sed -i 's|\./TuxGuitar-pdf/tuxguitar-pdf
  \./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
 
 # Set debug="true" on javac part of the build scripts.
 for file in $(find . -name build.xml); do
@@ -176,6 +186,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_bindir}/%{name}
 
 %changelog
+* Sat Nov 14 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-1
+- New upstream version
+
 * Wed Aug 05 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-3
 - Update the .desktop file