[fatrat] disable all Java features due to licensing issues

jvcelak jvcelak at fedoraproject.org
Wed Aug 22 15:40:46 UTC 2012


commit 7fbf77a8a2698d172ad6af7a00d8a034485707a8
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Wed Aug 22 16:56:10 2012 +0200

    disable all Java features due to licensing issues
    
    Resolves: #849574

 fatrat-remove-java-libs.patch |   18 ------------------
 fatrat.spec                   |   19 ++++++++-----------
 2 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/fatrat.spec b/fatrat.spec
index 54d95e4..d883337 100644
--- a/fatrat.spec
+++ b/fatrat.spec
@@ -1,6 +1,6 @@
 Name: fatrat
 Version: 1.2.0
-Release: 0.6.beta2%{?dist}
+Release: 0.7.beta2%{?dist}
 Epoch: 1
 Summary: Feature-rich download manager
 Group: Applications/Internet
@@ -11,19 +11,14 @@ Source0: http://www.dolezel.info/download/data/fatrat/fatrat-%{version}_beta2.ta
 Patch0: fatrat-headers.patch
 
 Patch10: fatrat-remove-java-applet.patch
-Patch11: fatrat-remove-java-libs.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.7.0-openjdk-devel
 BuildRequires: desktop-file-utils
 
-# Required Java libraries
-Requires: json, apache-commons-codec, apache-commons-io, apache-commons-lang
-
 %description
 FatRat is download manager written in C++ and build on top of the Qt4 library.
 It is rich in features and is continuously extended. Main characteristics:
@@ -61,16 +56,14 @@ This package contains header files needed for development of FatRat plugins.
 %setup -q -n %{name}-%{version}_beta2
 %patch0 -p1
 
+# remove Java web-interface applet
 rm -rf data/remote/applet.html data/remote/applet/
 %patch10 -p1
 
-# remove bundled Java libraries
+# make sure we do not package some bundled JAR
 rm -rf data/java/libs
-%patch11 -p1
 
 %build
-export CXXFLAGS="%{optflags} -DBOOST_ASIO_DYN_LINK"
-export JAVA_HOME="%{java_home}"
 %{cmake} . \
 	-DCMAKE_EXE_LINKER_FLAGS="-lpthread -lssl -lcrypto -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt -llog4cpp" \
 	-DWITH_NLS=ON \
@@ -79,7 +72,7 @@ export JAVA_HOME="%{java_home}"
 	-DWITH_JABBER=ON \
 	-DWITH_DOCUMENTATION=ON \
 	-DWITH_WEBINTERFACE=ON \
-	-DWITH_JPLUGINS=ON
+	-DWITH_JPLUGINS=OFF
 make %{?_smp_mflags}
 
 
@@ -119,6 +112,10 @@ install -d -m 0755 %{buildroot}%{_libdir}/fatrat/plugins
 
 
 %changelog
+* Wed Aug 22 2012 Jan Vcelak <jvcelak at redhat.com> 1:1.2.0-0.7.beta2
+- disable all Java features because of dependencies on some libraries
+  which are unacceptable for Fedora (#849574)
+
 * Mon Aug 20 2012 Jan Vcelak <jvcelak at redhat.com> 1:1.2.0-0.6.beta2
 - rebase to new upstream release
 - remove bundled Java libraries (#849574)


More information about the scm-commits mailing list