[tuxguitar] Require itext-core instead of itext to drop gcj dependency
Orcan Ogetbil
oget at fedoraproject.org
Mon Feb 20 02:19:40 UTC 2012
commit 548630a0f5827c76ad752dc6ff32b859fa53b8cb
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date: Sun Feb 19 21:19:38 2012 -0500
Require itext-core instead of itext to drop gcj dependency
tuxguitar.spec | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/tuxguitar.spec b/tuxguitar.spec
index 2d85750..89fe9a2 100644
--- a/tuxguitar.spec
+++ b/tuxguitar.spec
@@ -1,7 +1,7 @@
Summary: A multitrack tablature editor and player written in Java-SWT
Name: tuxguitar
Version: 1.2
-Release: 6%{?dist}
+Release: 7%{?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:
@@ -13,9 +13,8 @@ Patch0: %{name}-plugin-properties.patch
License: LGPLv2+
Group: Applications/Multimedia
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: itext
+Requires: itext-core
Requires: java >= 1.7
Requires: jpackage-utils
Requires: eclipse-swt
@@ -24,7 +23,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: ant-nodeps
-BuildRequires: itext
+BuildRequires: itext-core
BuildRequires: desktop-file-utils
BuildRequires: fluidsynth-devel
BuildRequires: jack-audio-connection-kit-devel
@@ -93,8 +92,6 @@ for jni in $JNIS; do
done
%install
-rm -rf $RPM_BUILD_ROOT
-
# to pass to ant:
ANT_FLAGS=" \
-Dpath.tuxguitar=$PWD/TuxGuitar/%{name}.jar \
@@ -119,8 +116,6 @@ cp -a TuxGuitar-*/jni/*.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
@@ -140,7 +135,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/
%{_libdir}/%{name}
%{_datadir}/%{name}
@@ -150,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/%{name}
%changelog
+* Sun Feb 19 2012 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com>> - 1.2-7
+- Require itext-core instead of itext to drop gcj dependency
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list