[zanata-client/f20] remove xom dependency and add SNI fix

Patrick Huang pahuang at fedoraproject.org
Fri Jul 18 04:06:41 UTC 2014


commit 9994561df313c0e677d7e214b92a66c46a3e91f1
Author: Patrick Huang <pahuang at redhat.com>
Date:   Fri Jul 18 00:05:24 2014 -0400

    remove xom dependency and add SNI fix

 zanata-client.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/zanata-client.spec b/zanata-client.spec
index 93fb4a5..8e9e5f1 100644
--- a/zanata-client.spec
+++ b/zanata-client.spec
@@ -6,13 +6,14 @@
 
 Name:           zanata-%{shortname}
 Version:        3.3.2
-Release:        1%{?dist}
+Release:        2%{?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:         sni.patch
 
 BuildArch:      noarch
 
@@ -28,7 +29,6 @@ BuildRequires:  powermock-core
 BuildRequires:  mvn(org.simpleframework:simple)
 BuildRequires:  zanata-parent
 BuildRequires:  zanata-api
-BuildRequires:  xom
 BuildRequires:  zanata-common
 BuildRequires:  args4j >= 2.0.25
 BuildRequires:  opencsv
@@ -44,7 +44,6 @@ Requires:       args4j >= 2.0.25
 Requires:       opencsv
 Requires:       openprops
 Requires:       jgettext
-Requires:       xom
 
 
 %description
@@ -65,6 +64,8 @@ This includes submodules:
 
 %prep
 %setup -q -n %{name}-%{shortname}-%{version}
+%patch0
+
 %pom_disable_module zanata-maven-plugin 
 %pom_remove_plugin :appassembler-maven-plugin %{submodule_cli}
 %pom_remove_plugin :maven-assembly-plugin %{submodule_cli}
@@ -139,7 +140,7 @@ fi
 
 # Configuration
 MAIN_CLASS=org.zanata.client.ZanataClient
-BASE_JARS="%{submodule_rest} %{submodule_commands} %{submodule_cli} slf4j/log4j12 opencsv"
+BASE_JARS="%{name} slf4j/log4j12 opencsv"
 CLASSPATH=%{CLASSPATH}
 
 # Set parameters
@@ -163,6 +164,9 @@ chmod 755 %{buildroot}%{_bindir}/zanata-cli
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Jul 18 2014 Patrick Huang <pahuang at redhat.com> 3.3.2-2
+- Remove xom dependency and fix executable script
+
 * Mon Jun 02 2014 Patrick Huang <pahuang at redhat.com> 3.3.2-1
 - Latest upstream version
 


More information about the scm-commits mailing list