[gooddata-cl] Update to 1.0.5

[Lubomir Rintel]

commit f12c5fe4a25a57a789ca5d478173d65d74002f78
Author: Lubomir Rintel <lkundrak at v3.sk>
Date:   Fri May 16 15:24:47 2014 +0200

    Update to 1.0.5
    
    - Add Python 3 support

 0001-Wrangle-the-utf8-magic.patch |   25 +++++++++++++++++++++++
 gooddata-cl.spec                  |   40 ++++++++++++++++++++++++-------------
 2 files changed, 51 insertions(+), 14 deletions(-)
---
diff --git a/0001-Wrangle-the-utf8-magic.patch b/0001-Wrangle-the-utf8-magic.patch
new file mode 100644
index 0000000..4bc4c93
--- /dev/null
+++ b/0001-Wrangle-the-utf8-magic.patch
@@ -0,0 +1,25 @@
+From 4a1037c6ef379d2b2912fca8e52c232c7c666646 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Fri, 16 May 2014 15:08:59 +0200
+Subject: [PATCH] Wrangle the utf8 magic
+
+---
+ common/src/main/java/com/gooddata/util/FileUtil.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/src/main/java/com/gooddata/util/FileUtil.java b/common/src/main/java/com/gooddata/util/FileUtil.java
+index f7f9ea0..9f06490 100644
+--- a/common/src/main/java/com/gooddata/util/FileUtil.java
++++ b/common/src/main/java/com/gooddata/util/FileUtil.java
+@@ -245,7 +245,7 @@ public class FileUtil {
+     public static void writeJSONToFile(JSON content, String fileName) throws IOException {
+         BufferedWriter fw = createBufferedUtf8Writer(fileName);
+         String str = content.toString(2);
+-        str = str.replace("�", " "); // ugly but works
++        str = str.replace("\345", " "); // ugly but works
+         fw.write(str);
+         fw.flush();
+         fw.close();
+-- 
+1.9.0
+
diff --git a/gooddata-cl.spec b/gooddata-cl.spec
index 7abe6f8..c55993e 100644
--- a/gooddata-cl.spec
+++ b/gooddata-cl.spec
@@ -26,6 +26,7 @@ Patch7:         0007-Remove-FTP-support-it-should-not-be-used.patch
 Patch8:         0008-Drop-GA-connector.patch
 Patch9:         0009-Drop-jdk15-classifiers.patch
 Patch10:        0010-Pull-in-xerces-since-the-XML-api-got-deprecated.patch
+Patch11:        0001-Wrangle-the-utf8-magic.patch
 
 Requires:       apache-commons-beanutils
 Requires:       apache-commons-cli
@@ -54,6 +55,7 @@ Requires:       joda-time
 Requires:       json-lib
 Requires:       json_simple
 Requires:       junit
+Requires:       log4j-over-slf4j
 Requires:       logback
 Requires:       mysql-connector-java
 Requires:       opencsv
@@ -104,6 +106,7 @@ BuildRequires:  joda-time
 BuildRequires:  json-lib
 BuildRequires:  json_simple
 BuildRequires:  junit
+BuildRequires:  log4j-over-slf4j
 BuildRequires:  logback
 BuildRequires:  mysql-connector-java
 BuildRequires:  opencsv
@@ -122,6 +125,15 @@ modeling, transformation and loading utilities that work on top of the
 GoodData REST APIs.
 
 
+%package javadoc
+Summary:        API documentation for gooddata-cl
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+
+%description javadoc
+Javadoc documentation of gooddata-cl API.
+
+
 %prep
 %setup -q
 %patch1 -p1
@@ -134,29 +146,20 @@ GoodData REST APIs.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
-# These don't ship with POMs yet.
-
-mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=org.apache.axis \
-        -DartifactId=axis -Dversion=1.4 -Dfile=$(build-classpath axis/axis)
-mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=org.apache.axis \
-        -DartifactId=axis-jaxrpc -Dversion=1.4 -Dfile=$(build-classpath axis/jaxrpc)
-mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=org.apache.axis \
-        -DartifactId=axis-saaj -Dversion=1.4 -Dfile=$(build-classpath axis/saaj)
-
-mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=oauth.signpost \
+# This don't ship with POMs yet.
+xmvn install:install-file -Dpackaging=jar -DgroupId=oauth.signpost \
         -DartifactId=signpost-core -Dversion=1.2 -Dfile=$(build-classpath signpost-core)
 
-mvn-rpmbuild install:install-file -Dpackaging=jar -DgroupId=com.googlecode.json-simple \
-        -DartifactId=json-simple -Dversion=1.1 -Dfile=$(build-classpath json_simple)
-
-mvn-rpmbuild -Dmaven.test.skip=true install
+%mvn_build -- -Dmaven.test.skip=true
 
 
 %install
 # Directory tree
 install -d %{buildroot}%{_javadir}/%{name}
+install -d %{buildroot}%{_javadocdir}
 install -d %{buildroot}%{_sysconfdir}/%{name}
 install -d %{buildroot}%{_bindir}
 install -d %{buildroot}%{_sysconfdir}
@@ -178,6 +181,9 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/gooddata-cl.conf
 # Launcher
 %jpackage_script com.gooddata.processor.GdcDI '' '' xpp3:slf4j/api:axis/saaj:axis/jaxrpc:json_simple:joda-time:slf4j/log4j-over-slf4j:commons-beanutils:commons-lang:apache-commons-jexl:commons-io:jaxen:axis:httpcomponents/httpcore:dom4j:jackrabbit-webdav:junit:httpcomponents/httpclient:mysql-connector-java:opencsv:commons-collections:signpost-core:javassist:json-lib:commons-cli:commons-logging:commons-discovery:commons-codec:commons-net:logback/logback-classic:icu4j:xstream:logback/logback-core:derby:ezmorph:jdom:commons-httpclient:gooddata-cl gooddata-cli false
 
+# Documentation
+cp -a target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
+
 
 %files
 %{_bindir}/*
@@ -186,9 +192,15 @@ install -pm644 %{SOURCE1} %{buildroot}%{_sysconfdir}/gooddata-cl.conf
 %doc README* LICENSE.TXT
 
 
+%files javadoc
+%{_javadocdir}/%{name}
+
+
 %changelog
 * Fri May 16 2014 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.2.73-1
 - Update to a later version
+- Modernize build
+- Add javadoc documentation
 
 * Mon Oct 28 2013 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.2.69-1
 - Update to a later version