[tuxguitar] Remove gcj bits as per the new guidelines. Change Requires: libswt3-gtk2 to eclipse-swt
Orcan Ogetbil
oget at fedoraproject.org
Sat Sep 17 01:15:24 UTC 2011
commit 7b121f437d0542f4c8163ec353c187b7ccd7a8cf
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Fri Sep 16 21:15:10 2011 -0400
Remove gcj bits as per the new guidelines.
Change Requires: libswt3-gtk2 to eclipse-swt
tuxguitar.spec | 39 +++++++--------------------------------
1 files changed, 7 insertions(+), 32 deletions(-)
---
diff --git a/tuxguitar.spec b/tuxguitar.spec
index 901ab4a..d434705 100644
--- a/tuxguitar.spec
+++ b/tuxguitar.spec
@@ -1,9 +1,7 @@
-%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: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.tuxguitar.com.ar
Source0: http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.tar.gz
# Fedora specific build script. Accepted by upstream:
@@ -20,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: itext
Requires: java >= 1.7
Requires: jpackage-utils
-Requires: libswt3-gtk2
+Requires: eclipse-swt
Requires: soundfont2-default
BuildRequires: alsa-lib-devel
BuildRequires: ant
@@ -33,13 +31,7 @@ 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
-Requires(post): java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-%endif
-
+BuildRequires: eclipse-swt
%description
TuxGuitar is a guitar tablature editor with player support through midi. It can
@@ -124,10 +116,6 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
-%if %{with_gcj}
- %{_bindir}/aot-compile-rpm
-%endif
-
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -135,23 +123,11 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
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 ||:
%postun
-%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
@@ -171,14 +147,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/mime/packages/*.xml
-
-%if %{with_gcj}
-%{_libdir}/gcj/%{name}
-%endif
-
%{_bindir}/%{name}
%changelog
+* Fri Sep 16 2011 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-5
+- Remove gcj bits as per the new guidelines.
+- Change Requires: libswt3-gtk2 to eclipse-swt
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list