rpms/ec2-api-tools/devel ec2-api-tools.spec, 1.4, 1.5 ec2-cmd, 1.1, 1.2

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/nonfree/rpms/ec2-api-tools/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6218

Modified Files:
	ec2-api-tools.spec ec2-cmd 
Log Message:
* Mon Aug 09 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.3.53907-2
- Reuse distribution JARs wherever possible



Index: ec2-api-tools.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ec2-api-tools/devel/ec2-api-tools.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ec2-api-tools.spec	9 Aug 2010 16:24:21 -0000	1.4
+++ ec2-api-tools.spec	9 Aug 2010 16:32:52 -0000	1.5
@@ -3,7 +3,7 @@
 
 Name:           ec2-api-tools
 Version:        %{major_version}.%{minor_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Amazon EC2 Command-Line Tools
 
 Group:          Applications/Internet
@@ -18,6 +18,19 @@
 
 Requires:       jpackage-utils
 Requires:       java >= 1.5
+Requires:       jakarta-commons-cli 
+Requires:       commons-codec 
+Requires:       jakarta-commons-discovery 
+Requires:       commons-httpclient 
+Requires:       jakarta-commons-logging 
+Requires:       jaf 
+Requires:       bcprov 
+Requires:       bea-stax-api 
+Requires:       javamail 
+Requires:       jdom 
+Requires:       log4j 
+Requires:       wsdl4j 
+Requires:       xalan-j2 
 
 BuildArch:      noarch
 
@@ -32,6 +45,24 @@
 
 
 %build
+# Drop jars that are distributable by Fedora
+xargs rm -f <<EOF
+lib/activation-1.1.jar
+lib/bcprov.jar
+lib/commons-cli-1.1.jar
+lib/commons-codec-1.3.jar
+lib/commons-discovery-0.2.jar
+lib/commons-httpclient-3.0.jar
+lib/commons-logging-1.0.4.jar
+lib/jaxb-api-2.0.jar
+lib/jdom-1.0.jar
+lib/log4j.jar
+lib/mail-1.4.jar
+lib/stax-api-1.0.1.jar
+lib/wsdl4j-1.6.1.jar
+lib/xalan-j2-2.7.0.jar
+lib/xalan-j2-serializer-2.7.0.jar
+EOF
 
 
 %install
@@ -72,6 +103,9 @@
 
 
 %changelog
+* Mon Aug 09 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.3.53907-2
+- Reuse distribution JARs wherever possible
+
 * Mon Aug 09 2010 Lubomir Rintel (GoodData) <lubo.rintel at gooddata.com> - 1.3.53907-1
 - Update to 53907, support for Cluster Compute instances
 


Index: ec2-cmd
===================================================================
RCS file: /cvs/nonfree/rpms/ec2-api-tools/devel/ec2-cmd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ec2-cmd	2 Aug 2009 15:24:12 -0000	1.1
+++ ec2-cmd	9 Aug 2010 16:32:52 -0000	1.2
@@ -28,16 +28,34 @@
 	exit 1
 fi
 
+# Bundled
+BASE_JARS="$BASE_JARS ec2-api-tools"
+
+# Dependencies
+BASE_JARS="$BASE_JARS commons-cli"
+BASE_JARS="$BASE_JARS commons-codec"
+BASE_JARS="$BASE_JARS commons-discovery"
+BASE_JARS="$BASE_JARS commons-httpclient"
+BASE_JARS="$BASE_JARS commons-logging"
+BASE_JARS="$BASE_JARS activation"
+BASE_JARS="$BASE_JARS bcprov"
+BASE_JARS="$BASE_JARS bea-stax-api"
+BASE_JARS="$BASE_JARS javamail"
+BASE_JARS="$BASE_JARS jaxme/jaxmeapi"
+BASE_JARS="$BASE_JARS jdom"
+BASE_JARS="$BASE_JARS log4j"
+BASE_JARS="$BASE_JARS wsdl4j"
+BASE_JARS="$BASE_JARS xalan-j2"
+BASE_JARS="$BASE_JARS xalan-j2-serializer"
+
 # Rest of the configuration
 MAIN_CLASS=com.amazon.aes.webservices.client.cmd.$CMD
 
 # Set parameters
 set_jvm
-
+set_classpath $BASE_JARS
 set_flags $BASE_FLAGS
 set_options $BASE_OPTIONS $EC2CMD_OPTS
 
-CLASSPATH=$(echo /usr/share/java/ec2-api-tools/* |sed 's/ /:/g')
-
 # Let's start
 run "$@"