[zanata-client/f18] fix classpath issue in f18

[Patrick Huang]

commit 490f71113ddbd458792fb07f53e66ccb1c1d018e
Author: Patrick Huang <pahuang at redhat.com>
Date:   Thu Nov 14 19:36:29 2013 -0500

    fix classpath issue in f18

 zanata-client.spec |   39 ++++++++-------------------------------
 1 files changed, 8 insertions(+), 31 deletions(-)
---
diff --git a/zanata-client.spec b/zanata-client.spec
index 8fb237a..1efa0d4 100644
--- a/zanata-client.spec
+++ b/zanata-client.spec
@@ -12,14 +12,13 @@
 
 Name:           zanata-%{shortname}
 Version:        2.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Zanata client module
 
 Group:          Development/Tools
 License:        LGPLv2+
 URL:            https://github.com/zanata/%{name}
 Source0:        https://github.com/zanata/%{name}/archive/%{shortname}-%{version}.zip
-Patch0:         slf4j-backward-compatible-fix.patch
 
 BuildArch:      noarch
 
@@ -36,9 +35,7 @@ BuildRequires:  zanata-parent
 BuildRequires:  zanata-api
 BuildRequires:  junit
 BuildRequires:  resteasy
-%if 0%{?fedora} < 19
 BuildRequires:  apache-james-project
-%endif
 
 # dependencies in zanata-common-commands
 BuildRequires:  zanata-common
@@ -61,6 +58,7 @@ BuildRequires:  %mvn_exec_plugin
 
 Requires:       jpackage-utils
 Requires:       java
+Requires:       maven
 
 Requires:       slf4j
 Requires:       zanata-api
@@ -101,24 +99,10 @@ This includes submodules:
 %pom_remove_plugin :appassembler-maven-plugin %{submodule_cli}
 %pom_remove_plugin :maven-assembly-plugin %{submodule_cli}
 
-%if 0%{?fedora} < 18
-%patch0
-%endif
-
-
 %build
 # -Dmaven.local.debug=true
-# we delete all test class under f19 because of hamcrest compatibility issue
-%if 0%{?fedora} > 19
-%mvn_build -- -Dmdep.analyze.skip=true
-%endif
-%if 0%{?fedora} == 19
-find . -type f -name "*Test.java" | xargs rm
-%mvn_build -- -Dmdep.analyze.skip=true -DskipTests
-%else
 find . -type f -name "*Test.java" | xargs rm
 mvn-rpmbuild package javadoc:aggregate -DskipTests
-%endif
 
 # local offline maven can not resolve each module, 
 # we have to disable our own module and generate classpath one by one
@@ -137,9 +121,6 @@ mvn-rpmbuild dependency:build-classpath -DincludeScope=compile -Dmdep.outputFile
 
 
 %install
-%if 0%{?fedora} > 18
-%mvn_install
-%else
 mkdir -p %{buildroot}%{_javadir}
 
 cp -p %{submodule_rest}/target/%{submodule_rest}*-%{version}.jar %{buildroot}%{_javadir}/%{submodule_rest}.jar
@@ -161,8 +142,6 @@ install -pm 644 %{submodule_cli}/pom.xml  %{buildroot}%{_mavenpomdir}/JPP-%{subm
 %add_maven_depmap JPP-%{submodule_rest}.pom %{submodule_rest}.jar
 %add_maven_depmap JPP-%{submodule_commands}.pom %{submodule_commands}.jar
 %add_maven_depmap JPP-%{submodule_cli}.pom %{submodule_cli}.jar
-%endif
-
 
 rest_cp=$(cat %{submodule_rest}/target/%{submodule_rest}-classpath.txt)
 commands_cp=$(cat %{submodule_commands}/target/%{submodule_commands}-classpath.txt)
@@ -198,7 +177,7 @@ fi
 
 # Configuration
 MAIN_CLASS=org.zanata.client.ZanataClient
-BASE_JARS="%{name}/%{submodule_rest} %{name}/%{submodule_commands} %{name}/%{submodule_cli} slf4j/log4j12 opencsv"
+BASE_JARS="%{submodule_rest} %{submodule_commands} %{submodule_cli} slf4j/log4j12 opencsv"
 CLASSPATH=%{CLASSPATH}
 
 # Set parameters
@@ -215,22 +194,20 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli
 
 
 %files -f .mfiles
-%if 0%{?fedora} > 18
-%dir %{_javadir}/%{name}
-%endif
 %attr(0755,root,root) %{_bindir}/zanata-cli
 %doc README.txt
 
-%if 0%{?fedora} > 18
-%files javadoc -f .mfiles-javadoc
-%else
 %files javadoc
 %{_javadocdir}/%{name}/%{submodule_rest}
 %{_javadocdir}/%{name}/%{submodule_commands}
 %{_javadocdir}/%{name}/%{submodule_cli}
-%endif
 
 %changelog
+* Thu Nov 14 2013 Patrick Huang <pahuang at redhat.com> 2.2.0-4
+- Fix classpath in fedora 18
+- Remove conditional build for other fedora version
+- Add require maven
+
 * Fri Nov 01 2013 Ding-Yi Chen <dchen at redhat.com> 2.2.0-3
 - Fixes Bug 1025112 - zanata-cli: Incorrect BASE_JARS