rpms/tuxguitar/F-10 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tuxguitar.spec, 1.2, 1.3
Orcan Ogetbil
oget at fedoraproject.org
Sat Apr 4 23:51:56 UTC 2009
Author: oget
Update of /cvs/pkgs/rpms/tuxguitar/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15090
Modified Files:
.cvsignore sources tuxguitar.spec
Log Message:
* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
- New upstream version
- Clean-up the SPEC file
- Include GCJ-AOT-bits
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 3 Oct 2008 17:40:22 -0000 1.2
+++ .cvsignore 4 Apr 2009 23:51:25 -0000 1.3
@@ -1 +1 @@
-tuxguitar-src-1.0.tar.gz
+tuxguitar-src-1.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 3 Oct 2008 17:40:22 -0000 1.2
+++ sources 4 Apr 2009 23:51:25 -0000 1.3
@@ -1 +1 @@
-a9873adad0df58202d889648eb484879 tuxguitar-src-1.0.tar.gz
+fbb664eca06e564bf1f2384930df2a7e tuxguitar-src-1.1.tar.gz
Index: tuxguitar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tuxguitar/F-10/tuxguitar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tuxguitar.spec 16 Oct 2008 04:06:22 -0000 1.2
+++ tuxguitar.spec 4 Apr 2009 23:51:26 -0000 1.3
@@ -1,46 +1,47 @@
-Summary: A multitrack tablature editor and player written in Java-SWT
-Name: tuxguitar
-Version: 1.0
-Release: 8%{?dist}
-URL: http://www.tuxguitar.com.ar
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
-Source9: %{name}.desktop
-License: LGPLv2+
-Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# The package java-icedtea is not available on F-8 for ppc & ppc64.
-# https://bugzilla.redhat.com/show_bug.cgi?id=464843
-%if "%{fedora}" == "8"
-ExcludeArch: ppc ppc64
+%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
+
+Summary: A multitrack tablature editor and player written in Java-SWT
+Name: tuxguitar
+Version: 1.1
+Release: 1%{?dist}
+URL: http://www.tuxguitar.com.ar
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
+Source9: %{name}.desktop
+License: LGPLv2+
+Group: Applications/Multimedia
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: itext
+Requires: java >= 1.7
+Requires: jpackage-utils
+Requires: libswt3-gtk2
+BuildRequires: alsa-lib-devel
+BuildRequires: ant
+BuildRequires: itext
+BuildRequires: desktop-file-utils
+BuildRequires: fluidsynth-devel
+BuildRequires: java-devel >= 1.7
+BuildRequires: jpackage-utils
+BuildRequires: libswt3-gtk2
+%if %{with_gcj}
+BuildRequires: java-gcj-compat-devel >= 1.0.31
+Requires(post): java-gcj-compat >= 1.0.31
+Requires(postun): java-gcj-compat >= 1.0.31
%endif
-Requires: itext
-Requires: java >= 1.7
-Requires: jpackage-utils
-Requires: libswt3-gtk2
-BuildRequires: alsa-lib-devel
-BuildRequires: ant
-BuildRequires: itext
-BuildRequires: desktop-file-utils
-BuildRequires: fluidsynth-devel
-BuildRequires: java-devel >= 1.7
-BuildRequires: jpackage-utils
-BuildRequires: libswt3-gtk2
+
%description
-TuxGuitar is a guitar tablature editor with player support through
-midi. It can display scores and multitrack tabs. Various features
-TuxGuitar provides include autoscrolling while playing, note
-duration management, bend/slide/vibrato/hammer-on/pull-off effects,
-support for tuplets, time signature management, tempo management,
-gp3/gp4/gp5 import and export.
+TuxGuitar is a guitar tablature editor with player support through midi. It can
+display scores and multitrack tabs. Various features TuxGuitar provides include
+autoscrolling while playing, note duration management, bend/slide/vibrato/
+hammer-on/pull-off effects, support for tuplets, time signature management,
+tempo management, gp3/gp4/gp5 import and export.
%prep
%setup -q -n %{name}-src-%{version}
# The following issues were discussed in:
# http://www.tuxguitar.com.ar/forum/4/817/need-help-with-packaging-for-fedora/
-# Prevent static library paths to be built in TuxGuitar.jar (META-INF/MANIFEST.MF)
-sed -i 's/<attribute name="Class-Path" value="${lib.swt.jar} ${dist.share.path}"\/>//' TuxGuitar/build.xml
# 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
@@ -48,24 +49,39 @@
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
+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
-# Remove pre-shipped binaries
-find -name .DS_Store -exec rm {} \;
+
+# 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
+
+
+# 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
+done
+
%build
# Does not compile with %%{?_smp_mflags}. Build using openjdk.
-# Note that the lib directory is /usr/lib for openjdk, regardless of the architecture.
-%if "%{fedora}" == "8"
- %define openjdkdir /usr/lib/jvm/java-icedtea
-%else
- %define openjdkdir /usr/lib/jvm/java-openjdk
-%endif
# SWT_JAR=$(build-classpath swt) does not work here ???
-make SWT_JAR=%{_libdir}/java/swt.jar CFLAGS="${RPM_OPT_FLAGS} -I%{openjdkdir}/include -I%{openjdkdir}/include/linux -fPIC"
+make SWT_JAR=%{_libdir}/java/swt.jar \
+ CFLAGS="${RPM_OPT_FLAGS} \
+ -I%{_jvmdir}/java-openjdk/include \
+ -I%{_jvmdir}/java-openjdk/include/linux \
+ -fPIC"
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,15 +102,15 @@
# 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
-done
-
-# mime-type icons
-install -dm 755 $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes
-for type in tuxguitar gtp ptb; do
- install -pm 644 TuxGuitar/share/skins/Lavender/icon-96x96.png \
- $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/96x96/mimetypes/audio-x-${type}.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
# desktop files
@@ -107,24 +123,41 @@
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
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
+%if %{with_gcj}
+ 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
update-mime-database %{_datadir}/mime >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-update-desktop-database &> /dev/null || :
%postun
-update-mime-database %{_datadir}/mime >& /dev/null ||:
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%if %{with_gcj}
+ 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
fi
-update-desktop-database &> /dev/null || :
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime >& /dev/null ||:
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%defattr(-,root,root,-)
@@ -136,27 +169,36 @@
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/*.xml
+%if %{with_gcj}
+%{_libdir}/gcj/%{name}
+%endif
+
%{_bindir}/%{name}
%changelog
-* Wed Oct 15 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-8
+* Sat Apr 04 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.1-1
+- New upstream version
+- Clean-up the SPEC file
+- Include GCJ-AOT-bits
+
+* Wed Oct 15 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-8
- Enabled the PDF plugin since all the dependencies are now provided in repos
-* Thu Oct 02 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-7
+* Thu Oct 02 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-7
- Added "exec" to replace the called shell to java process in the launching script
-* Wed Oct 01 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-6
+* Wed Oct 01 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-6
- Required libswt3-gtk2 since rpmbuild doesn't pick it up.
- Some more cleanup in the spec file
- Fixed a typo regarding installation of icons
- Called update-desktop-database in %%post and %%postun
- jni files put in %%_libdir_/%%name.
-* Mon Sep 29 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-5
+* Mon Sep 29 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-5
- Compiled the package with openjdk instead of gcj.
- ExcludeArch'ed ppc/ppc64 on F-8.
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-4
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-4
- Added the comment about %%{?_smp_mflags}
- Used macros more extensively.
- Changed the license to LGPLv2+
@@ -165,16 +207,16 @@
- Removed pre-shipped binaries
- Fixed %%defattr
-* Sun Sep 28 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-3
+* Sun Sep 28 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-3
- Fixed java requirement issue by requiring icedtea for F-8 and openjdk for F-9+
- Patched the source to enable the fluidsynth plugin
- Added DistTag
- Patched the source in order to pass RPM_OPT_FLAGS to gcc
- Removed ExclusiveArch
-* Thu Sep 25 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-2
+* Thu Sep 25 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-2
- Added desktop-file-utils to BuildRequires.
- Replaced java-1.7.0-icedtea with java-1.6.0-openjdk in Requires.
-* Wed Sep 24 2008 Orcan Ogetbil <orcanbahri[AT]yahoo[DOT]com> - 1.0-1
+* Wed Sep 24 2008 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.0-1
- Initial build.
More information about the scm-commits
mailing list