[fatrat] fix: remove bundled libraries
jvcelak
jvcelak at fedoraproject.org
Wed May 2 14:49:19 UTC 2012
commit 49c88d4a74a115f5349f2372a8ef83f3d4cf7c55
Author: Jan Vcelak <jvcelak at redhat.com>
Date: Wed May 2 16:48:53 2012 +0200
fix: remove bundled libraries
Resolves: #813721
fatrat-remove-java-applet.patch | 13 +++++++++++++
fatrat.spec | 13 +++++++++++--
2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/fatrat-remove-java-applet.patch b/fatrat-remove-java-applet.patch
new file mode 100644
index 0000000..7ab2f88
--- /dev/null
+++ b/fatrat-remove-java-applet.patch
@@ -0,0 +1,13 @@
+Remove links for switching between AJAX and Java Applet versions of web interface.
+
+diff a/data/remote/index.html b/data/remote/index.html
+--- a/data/remote/index.html
++++ b/data/remote/index.html
+@@ -31,7 +31,6 @@
+ <!--<table id="bigtable">
+ <tr><td>-->
+ <div class="ui-layout-north">
+- <div id="modeswitch"><span class="active">AJAX version</span> / <a href="/applet.html">Applet version</a></div>
+ <img src="img/logo.png" alt="FatRat" id="logo" />
+ <div id="errors" class="ui-state-error"></div>
+ <div id="toolbar" class="ui-widget-header ui-corner-all">
diff --git a/fatrat.spec b/fatrat.spec
index 1e37875..c71e1f4 100644
--- a/fatrat.spec
+++ b/fatrat.spec
@@ -1,6 +1,6 @@
Name: fatrat
Version: 1.2.0
-Release: 0.4.beta1%{?dist}
+Release: 0.5.beta1%{?dist}
Epoch: 1
Summary: Feature-rich download manager
Group: Applications/Internet
@@ -13,12 +13,14 @@ Patch1: fatrat-headers.patch
Patch2: fatrat-boost-cygwin.patch
Patch3: fatrat-gcc47-missing-includes.patch
+Patch10: fatrat-remove-java-applet.patch
+
BuildRequires: cmake, qt4-devel, qt-sqlite
BuildRequires: libcurl-devel >= 7.18.2
BuildRequires: rb_libtorrent-devel >= 0.15.7, asio-devel, qt-webkit-devel
BuildRequires: gloox-devel >= 0.9
BuildRequires: pion-net-devel >= 3.0
-BuildRequires: java-1.6.0-openjdk-devel
+BuildRequires: java-1.7.0-openjdk-devel
BuildRequires: desktop-file-utils
%description
@@ -61,6 +63,8 @@ This package contains header files needed for development of FatRat plugins.
%patch2 -p1
%patch3 -p1
+rm -rf data/remote/applet.html data/remote/applet/
+%patch10 -p1
%build
export JAVA_HOME="%{java_home}"
@@ -112,6 +116,11 @@ install -d -m 0755 %{buildroot}%{_libdir}/fatrat/plugins
%changelog
+* Wed May 02 2012 Jan Vcelak <jvcelak at redhat.com> 1.2.0-0.5.beta1
+- fix: remove bundled libraries (#813721)
+ Java applet web interface was removed from the package
+- use java-1.7.0
+
* Tue Feb 28 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-0.4.beta1
- Rebuilt for c++ ABI breakage
More information about the scm-commits
mailing list