[fatrat] rebase to new upstream release

[jvcelak]

commit 289952464c34d48c6a1068326e7b8022172c249c
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Mon Aug 20 15:45:21 2012 +0200

    rebase to new upstream release

 .gitignore                          |    1 +
 fatrat-boost-cygwin.patch           |   27 ---------------------------
 fatrat-cmake-libs.patch             |   16 ----------------
 fatrat-gcc47-missing-includes.patch |   26 --------------------------
 fatrat-headers.patch                |    4 ++--
 fatrat-remove-java-libs.patch       |   18 ++++++++++++++++++
 fatrat.spec                         |   28 ++++++++++++++++------------
 sources                             |    2 +-
 8 files changed, 38 insertions(+), 84 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94a71da..198efc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /fatrat-1.2.0_beta1.tar.gz
+/fatrat-1.2.0_beta2.tar.xz
diff --git a/fatrat-headers.patch b/fatrat-headers.patch
index 7075069..66f7fa6 100644
--- a/fatrat-headers.patch
+++ b/fatrat-headers.patch
@@ -2,10 +2,10 @@ Add missing header file which is needed to build some plugins.
 
 Author: Jan Vcelak <jvcelak at redhat.com>
 
-diff a/CMakeLists.txt b/CMakeLists.txt
+diff --git a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -601,6 +601,7 @@ set(fatrat_DEV_HEADERS_ENGINES
+@@ -597,6 +597,7 @@ set(fatrat_DEV_HEADERS_ENGINES
  	${CMAKE_CURRENT_SOURCE_DIR}/src/engines/CurlPoller.h
  	${CMAKE_CURRENT_SOURCE_DIR}/src/engines/CurlStat.h
  	${CMAKE_CURRENT_SOURCE_DIR}/src/engines/UrlClient.h
diff --git a/fatrat-remove-java-libs.patch b/fatrat-remove-java-libs.patch
new file mode 100644
index 0000000..807c767
--- /dev/null
+++ b/fatrat-remove-java-libs.patch
@@ -0,0 +1,18 @@
+commit 6a4fc1d61820797819109e1b0ca30db31fffb4d4
+Author: Jan Vcelak <jvcelak at redhat.com>
+Date:   Mon Aug 20 15:34:42 2012 +0200
+
+    remove bundled Java libraries from cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c7280c..47a7a66 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -651,7 +651,6 @@ if(WITH_JPLUGINS)
+ 		OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/java/fatrat-jplugins.jar DESTINATION share/fatrat/data/java)
+ 	install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/java/extension.policy DESTINATION share/fatrat/data/java)
+-	install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/java/libs DESTINATION share/fatrat/data/java)
+ endif(WITH_JPLUGINS)
+ 
+ if(WITH_DOCUMENTATION)
diff --git a/fatrat.spec b/fatrat.spec
index 35add23..54d95e4 100644
--- a/fatrat.spec
+++ b/fatrat.spec
@@ -1,19 +1,17 @@
 Name: fatrat
 Version: 1.2.0
-Release: 0.6.beta1%{?dist}
+Release: 0.6.beta2%{?dist}
 Epoch: 1
 Summary: Feature-rich download manager
 Group: Applications/Internet
 License: GPLv2 and BSD and MIT
 URL: http://fatrat.dolezel.info
-Source0: http://www.dolezel.info/download/data/fatrat/fatrat-%{version}_beta1.tar.gz
+Source0: http://www.dolezel.info/download/data/fatrat/fatrat-%{version}_beta2.tar.xz
 
-Patch0: fatrat-cmake-libs.patch
-Patch1: fatrat-headers.patch
-Patch2: fatrat-boost-cygwin.patch
-Patch3: fatrat-gcc47-missing-includes.patch
+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
@@ -23,6 +21,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:
@@ -57,16 +58,18 @@ This package contains header files needed for development of FatRat plugins.
 
 
 %prep
-%setup -q -n %{name}-%{version}_beta1
+%setup -q -n %{name}-%{version}_beta2
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 rm -rf data/remote/applet.html data/remote/applet/
 %patch10 -p1
 
+# remove bundled Java libraries
+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" \
@@ -116,8 +119,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/fatrat/plugins
 
 
 %changelog
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.0-0.6.beta1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* 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)
 
 * Wed May 02 2012 Jan Vcelak <jvcelak at redhat.com> 1.2.0-0.5.beta1
 - fix: remove bundled libraries (#813721)
diff --git a/sources b/sources
index 2ee5b30..8f07dad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7ce4d5e6318361f36ba5ac86a5755da9  fatrat-1.2.0_beta1.tar.gz
+ad823d2a81f0583316ece815b928c71b  fatrat-1.2.0_beta2.tar.xz