[jets3t] update to 0.9.3
gil
gil at fedoraproject.org
Thu Feb 19 01:17:17 UTC 2015
commit ee9c1781d32c29808428a45303a10467edb13e7b
Author: gil <puntogil at libero.it>
Date: Thu Feb 19 02:16:16 2015 +0100
update to 0.9.3
.gitignore | 1 +
cockpit-0.9.0.pom | 28 -
...t-0.8.1-build_properties-rename_apps_jars.patch | 27 -
jets3t-0.8.1-replace_uuid_lib.patch | 44 --
jets3t-0.9.0-dist-build.patch | 764 --------------------
jets3t-0.9.0.pom | 69 --
jets3t-0.9.3-dist-build.patch | 46 ++
...9.0-scripts.patch => jets3t-0.9.3-scripts.patch | 129 ++--
jets3t-gui-0.9.0.pom | 28 -
jets3t.spec | 166 +++--
sources | 2 +-
synchronize-0.9.0.pom | 28 -
12 files changed, 215 insertions(+), 1117 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 954859b..c034456 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jets3t-0.9.0-clean-src-hg.tar.gz
+/jets3t-0.9.3.tar.xz
diff --git a/jets3t-0.9.3-dist-build.patch b/jets3t-0.9.3-dist-build.patch
new file mode 100644
index 0000000..8bd54a3
--- /dev/null
+++ b/jets3t-0.9.3-dist-build.patch
@@ -0,0 +1,46 @@
+--- dist-build.xml 2015-02-19 01:31:42.961518206 +0100
++++ dist-build.xml.dist-build 2015-02-19 01:31:49.743109520 +0100
+@@ -70,7 +70,21 @@
+ Define the script-wide classpath.
+ ================================= -->
+ <path id="classpath">
+- <fileset dir="${dir.libs}" includes="**/*.jar"/>
++ <fileset dir="/usr/share/java/" includes="jackson/jackson-core-asl.jar"/>
++ <fileset dir="/usr/share/java/" includes="jackson/jackson-mapper-asl.jar"/>
++ <fileset dir="/usr/share/java/" includes="mx4j/mx4j.jar"/>
++ <fileset dir="/usr/share/java/" includes="bcprov.jar"/>
++ <fileset dir="/usr/share/java/" includes="commons-codec.jar"/>
++ <fileset dir="/usr/share/java/" includes="commons-logging.jar"/>
++ <fileset dir="/usr/share/java/" includes="java-xmlbuilder.jar"/>
++ <fileset dir="/usr/share/java/" includes="base64.jar"/>
++ <fileset dir="/usr/share/java/" includes="junit.jar"/>
++ <fileset dir="/usr/share/java/" includes="httpcomponents/httpclient.jar"/>
++ <fileset dir="/usr/share/java/" includes="httpcomponents/httpcore.jar"/>
++ <fileset dir="/usr/share/java/" includes="log4j.jar"/>
++ <fileset dir="/usr/share/java/" includes="glassfish-servlet-api.jar"/>
++ <fileset dir="/usr/share/java/" includes="javamail/mail.jar"/>
++ <fileset dir="/usr/share/java/" includes="BareBonesBrowserLaunch.jar"/>
+ </path>
+
+
+@@ -425,6 +439,19 @@
+ <target name="clean">
+ <delete dir="${dir.build}"/>
+ </target>
+-
++
++ <target name="api-docs">
++ <mkdir dir="dist/api-docs"/>
++ <javadoc
++ author="false"
++ version="true"
++ destdir="dist/api-docs"
++ windowtitle="JetS3t API : Amazon S3 Toolkit">
++
++ <classpath refid="classpath"/>
++ <fileset dir="${dir.src}" includes="**/*.java"/>
++ </javadoc>
++ </target>
++
+ </project>
+
diff --git a/jets3t-0.9.0-scripts.patch b/jets3t-0.9.3-scripts.patch
similarity index 57%
rename from jets3t-0.9.0-scripts.patch
rename to jets3t-0.9.3-scripts.patch
index d85f503..472cebe 100644
--- a/jets3t-0.9.0-scripts.patch
+++ b/jets3t-0.9.3-scripts.patch
@@ -1,6 +1,6 @@
-diff -Nru scripts/cockpitlite.sh scripts-gil/cockpitlite.sh
---- scripts/cockpitlite.sh 2012-08-09 17:45:42.000000000 +0200
-+++ scripts-gil/cockpitlite.sh 2013-05-21 16:30:24.000000000 +0200
+diff -Nru jets3t-0.9.3/scripts/cockpitlite.sh jets3t-0.9.3.scripts/scripts/cockpitlite.sh
+--- jets3t-0.9.3/scripts/cockpitlite.sh 2015-02-15 16:25:18.000000000 +0100
++++ jets3t-0.9.3.scripts/scripts/cockpitlite.sh 2015-02-19 00:53:49.130021484 +0100
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
@@ -20,39 +20,47 @@ diff -Nru scripts/cockpitlite.sh scripts-gil/cockpitlite.sh
else
EXEC=java
fi
-@@ -50,17 +49,19 @@
+@@ -50,16 +49,28 @@
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
++# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
# Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/cockpitlite-{jets3t-version}.jar
--CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
--CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.4.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.6.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
-+CP=$CP:$JAVA_LIBS/jets3t/gui.jar
-+CP=$CP:$JAVA_LIBS/jets3t/cockpitlite.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
-+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
-+CP=$CP:$JAVA_LIBS/log4j.jar
++CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
++CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
++CP=$CP:$JAVA_LIBS/base64.jar
++CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
++CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
++CP=$CP:$JAVA_LIBS/javamail/mail.jar
++CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
++CP=$CP:$JAVA_LIBS/avalon-logkit.jar
++CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
++CP=$CP:$JAVA_LIBS/jms.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
-diff -Nru scripts/cockpit.sh scripts-gil/cockpit.sh
---- scripts/cockpit.sh 2012-08-09 17:45:42.000000000 +0200
-+++ scripts-gil/cockpit.sh 2013-05-21 16:32:06.000000000 +0200
+diff -Nru jets3t-0.9.3/scripts/cockpit.sh jets3t-0.9.3.scripts/scripts/cockpit.sh
+--- jets3t-0.9.3/scripts/cockpit.sh 2015-02-15 16:25:18.000000000 +0100
++++ jets3t-0.9.3.scripts/scripts/cockpit.sh 2015-02-19 00:49:36.898974304 +0100
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
@@ -72,7 +80,7 @@ diff -Nru scripts/cockpit.sh scripts-gil/cockpit.sh
else
EXEC=java
fi
-@@ -50,18 +49,22 @@
+@@ -50,17 +49,28 @@
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
@@ -83,32 +91,37 @@ diff -Nru scripts/cockpit.sh scripts-gil/cockpit.sh
-CP=$CP:$JETS3T_HOME/jars/jets3t-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/cockpit-{jets3t-version}.jar
--CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
--CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.4.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.6.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
--CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-0.4.jar
+-CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-1.0.jar
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
-+CP=$CP:$JAVA_LIBS/jets3t/gui.jar
-+CP=$CP:$JAVA_LIBS/jets3t/cockpit.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
-+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
-+CP=$CP:$JAVA_LIBS/log4j.jar
++CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
+CP=$CP:$JAVA_LIBS/base64.jar
++CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
++CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
++CP=$CP:$JAVA_LIBS/javamail/mail.jar
++CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
++CP=$CP:$JAVA_LIBS/avalon-logkit.jar
++CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
++CP=$CP:$JAVA_LIBS/jms.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
-diff -Nru scripts/synchronize.sh scripts-gil/synchronize.sh
---- scripts/synchronize.sh 2012-08-09 17:45:42.000000000 +0200
-+++ scripts-gil/synchronize.sh 2013-05-21 16:32:27.000000000 +0200
+diff -Nru jets3t-0.9.3/scripts/synchronize.sh jets3t-0.9.3.scripts/scripts/synchronize.sh
+--- jets3t-0.9.3/scripts/synchronize.sh 2015-02-15 16:25:18.000000000 +0100
++++ jets3t-0.9.3.scripts/scripts/synchronize.sh 2015-02-19 00:53:28.416221993 +0100
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
@@ -128,7 +141,7 @@ diff -Nru scripts/synchronize.sh scripts-gil/synchronize.sh
else
EXEC=java
fi
-@@ -50,16 +49,20 @@
+@@ -50,16 +49,28 @@
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
@@ -138,29 +151,37 @@ diff -Nru scripts/synchronize.sh scripts-gil/synchronize.sh
# Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/synchronize-{jets3t-version}.jar
--CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
--CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.4.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.1.2.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.6.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
--CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-0.4.jar
+-CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-1.0.jar
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
-+CP=$CP:$JAVA_LIBS/jets3t/synchronize.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
-+CP=$CP:$JAVA_LIBS/log4j.jar
++CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
+CP=$CP:$JAVA_LIBS/base64.jar
++CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
++CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
++CP=$CP:$JAVA_LIBS/javamail/mail.jar
++CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
++CP=$CP:$JAVA_LIBS/avalon-logkit.jar
++CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
++CP=$CP:$JAVA_LIBS/jms.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
-diff -Nru scripts/uploader.sh scripts-gil/uploader.sh
---- scripts/uploader.sh 2012-08-09 17:45:42.000000000 +0200
-+++ scripts-gil/uploader.sh 2013-05-21 16:30:24.000000000 +0200
+diff -Nru jets3t-0.9.3/scripts/uploader.sh jets3t-0.9.3.scripts/scripts/uploader.sh
+--- jets3t-0.9.3/scripts/uploader.sh 2015-02-15 16:25:18.000000000 +0100
++++ jets3t-0.9.3.scripts/scripts/uploader.sh 2015-02-19 00:49:11.799467598 +0100
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
@@ -180,7 +201,7 @@ diff -Nru scripts/uploader.sh scripts-gil/uploader.sh
else
EXEC=java
fi
-@@ -50,16 +49,19 @@
+@@ -50,15 +49,28 @@
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
@@ -191,21 +212,29 @@ diff -Nru scripts/uploader.sh scripts-gil/uploader.sh
-CP=$CP:$JETS3T_HOME/jars/jets3t-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-{jets3t-version}.jar
-CP=$CP:$JETS3T_HOME/jars/uploader-{jets3t-version}.jar
--CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
--CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.4.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.1.2.jar
--CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
+-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.2.jar
+-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
-+CP=$CP:$JAVA_LIBS/jets3t/gui.jar
-+CP=$CP:$JAVA_LIBS/jets3t/uploader.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
++CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
++CP=$CP:$JAVA_LIBS/bcprov.jar
++CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
++CP=$CP:$JAVA_LIBS/base64.jar
+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
-+CP=$CP:$JAVA_LIBS/log4j.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
++CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
++CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
++CP=$CP:$JAVA_LIBS/javamail/mail.jar
++CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
++CP=$CP:$JAVA_LIBS/avalon-logkit.jar
++CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
++CP=$CP:$JAVA_LIBS/jms.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
diff --git a/jets3t.spec b/jets3t.spec
index 89fdd80..978971d 100644
--- a/jets3t.spec
+++ b/jets3t.spec
@@ -1,68 +1,55 @@
Name: jets3t
-Version: 0.9.0
-Release: 4%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
Summary: Java interface to Amazon S3 and CloudFront services
# nuvola theme is under LGPL 2.1
# src/org/jets3t/gui/TableSorter.java BSD
License: ASL 2.0 and BSD and LGPLv2+
Url: http://jets3t.s3.amazonaws.com/index.html
-# hg clone https://bitbucket.org/jmurty/jets3t -r Release-0_9_0 jets3t-0.9.0
-# find jets3t-0.9.0/ -name "*.class" -delete
-# find jets3t-0.9.0/ -name "*.jar" -delete
-# find jets3t-0.9.0/ -name "*.bat" -delete
-# tar czf jets3t-0.9.0-clean-src-hg.tar.gz jets3t-0.9.0
-Source0: %{name}-%{version}-clean-src-hg.tar.gz
-Source1: http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}/%{version}/%{name}-%{version}.pom
-Source2: http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}-gui/%{version}/%{name}-gui-0.9.0.pom
-Source3: http://repo1.maven.org/maven2/net/java/dev/%{name}/cockpit/%{version}/cockpit-%{version}.pom
-Source4: http://repo1.maven.org/maven2/net/java/dev/%{name}/synchronize/%{version}/synchronize-%{version}.pom
+# hg clone https://bitbucket.org/jmurty/jets3t -r Release-0.9.3 jets3t-0.9.3
+# find jets3t-0.9.3/ -name "*.class" -delete
+# find jets3t-0.9.3/ -name "*.jar" -delete
+# find jets3t-0.9.3/ -name "*.bat" -delete
+# tar cJf jets3t-0.9.3.tar.xz jets3t-0.9.3
+Source0: %{name}-%{version}.tar.xz
# from Debian
Source5: %{name}-cockpit.pod
Source6: %{name}-cockpitlite.pod
Source7: %{name}-synchronize.pod
Source8: %{name}-uploader.pod
-# use jvm apis instead of jug-asl 2.0.0 library
-Patch0: %{name}-0.8.1-replace_uuid_lib.patch
-# added system classpath libraries and javadoc task, changed -source -target value 1.5
-Patch1: %{name}-%{version}-dist-build.patch
-# rename some artifacts
-Patch2: %{name}-0.8.1-build_properties-rename_apps_jars.patch
# fix java.home, jets3t.home, add system libraries refs
-Patch3: %{name}-%{version}-scripts.patch
+Patch0: %{name}-0.9.3-scripts.patch
# fix license fsf-address
-Patch4: %{name}-%{version}-nuvola-fsf-address.patch
+Patch1: %{name}-0.9.0-nuvola-fsf-address.patch
-BuildRequires: java-devel
+Patch2: %{name}-0.9.3-dist-build.patch
BuildRequires: ant
BuildRequires: apache-commons-codec
-BuildRequires: apache-commons-discovery
BuildRequires: apache-commons-logging
BuildRequires: BareBonesBrowserLaunch
-BuildRequires: base64
BuildRequires: bouncycastle
+BuildRequires: dos2unix
BuildRequires: httpcomponents-client
BuildRequires: httpcomponents-core
BuildRequires: jackson
+BuildRequires: java-base64
BuildRequires: java-xmlbuilder
BuildRequires: javamail
BuildRequires: junit
+%if %{?fedora} >= 21
BuildRequires: log4j12
+%else
+BuildRequires: log4j
+%endif
+BuildRequires: maven-local
BuildRequires: mx4j
-BuildRequires: tomcat-servlet-3.0-api
-
# pod2man
BuildRequires: perl
+BuildRequires: sonatype-oss-parent
+BuildRequires: glassfish-servlet-api
-Requires: apache-commons-codec
-Requires: apache-commons-logging
-Requires: httpcomponents-client
-Requires: httpcomponents-core
-Requires: java-xmlbuilder
-Requires: base64
-
-Requires: java
BuildArch: noarch
%description
@@ -73,16 +60,25 @@ content delivery network.
%package app
Summary: Graphical and command-line tools for Amazon S3 and CloudFront
Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
Requires: apache-commons-codec
Requires: apache-commons-logging
+Requires: avalon-framework
+Requires: avalon-logkit
Requires: BareBonesBrowserLaunch
Requires: base64
Requires: bouncycastle
+Requires: geronimo-jms
+Requires: glassfish-servlet-api
Requires: httpcomponents-client
Requires: httpcomponents-core
+Requires: java
Requires: java-xmlbuilder
+Requires: jpackage-utils
+%if %{?fedora} >= 21
Requires: log4j12
+%else
+Requires: log4j
+%endif
%description app
The JetS3t toolkit provides Java programmers with an API for interacting and
@@ -119,16 +115,34 @@ This package contains javadoc for %{name}.
%prep
%setup -q
-%patch0 -p0
+dos2unix dist-build.xml
+%patch0 -p1
+%if %{?fedora} < 21
+sed -i "s|log4j12-1.2.17.jar|log4j.jar|" scripts/*.sh
+sed -i "s|bcprov-jdk15on|bcprov-jdk16|" pom.xml
+%else
+sed -i "s|log4j.jar|log4j12-1.2.17.jar|" dist-build.xml
+%endif
%patch1 -p0
%patch2 -p0
-%patch3 -p0
-%patch4 -p0
+
+
+
+rm -rf src/contribs/com/centerkey/utils/BareBonesBrowserLaunch.java
+sed -i "s|contribs.com.centerkey.utils.BareBonesBrowserLaunch|com.centerkey.utils.BareBonesBrowserLaunch|" \
+ src/org/jets3t/apps/cockpit/Cockpit.java \
+ src/org/jets3t/apps/cockpit/gui/StartupDialog.java \
+ src/org/jets3t/apps/cockpitlite/CockpitLite.java \
+ src/org/jets3t/apps/uploader/Uploader.java \
+ src/org/jets3t/apps/cockpit/Cockpit.java \
+ src/org/jets3t/apps/cockpit/gui/StartupDialog.java \
+ src/org/jets3t/apps/cockpitlite/CockpitLite.java \
+ src/org/jets3t/apps/uploader/Uploader.java
find . -name "*.war" -delete
# fix non ASCII chars
-for s in src/org/jets3t/tests/BaseStorageServiceTests.java;do
+for s in test/org/jets3t/service/BaseStorageServiceTests.java;do
native2ascii -encoding UTF8 ${s} ${s}
done
@@ -139,63 +153,58 @@ cp -p %{SOURCE6} .
cp -p %{SOURCE7} .
cp -p %{SOURCE8} .
-sed -i "s|log4j.jar|log4j12-1.2.17.jar|" dist-build.xml
+%pom_remove_plugin org.apache.maven.plugins:maven-jarsigner-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
+# https://gil.fedorapeople.org/appassembler-1.9-1.fc20.src.rpm
+%pom_remove_plugin org.codehaus.mojo:appassembler-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:sonar-maven-plugin
+%pom_remove_plugin org.apache.maven.plugins:maven-javadoc-plugin
+
+%pom_remove_dep javax.activation:activation
+%pom_add_dep com.centerkey.utils:BareBonesBrowserLaunch:3.1
+
+#%% pom_remove_dep javax.servlet:javax.servlet-api
+#%% pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
+
+%mvn_alias net.java.dev.%{name}:%{name} ":cockpit"
+%mvn_alias net.java.dev.%{name}:%{name} ":cockpitlite"
+%mvn_alias net.java.dev.%{name}:%{name} ":%{name}-gui"
+%mvn_alias net.java.dev.%{name}:%{name} ":synchronize"
+%mvn_alias net.java.dev.%{name}:%{name} ":uploader"
%build
-ant -f dist-build.xml rebuild-all api-docs
+# test use web access
+%mvn_build -f
+
+ant -f dist-build.xml -Ddir.servlets=$PWD/servlet rebuild-gatekeeper
for m in cockpitlite cockpit synchronize uploader; do
%{_bindir}/pod2man -c '' -r '' %{name}-${m}.pod > %{name}-${m}.1 ;
done
%install
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-
-install -m 644 jars/%{name}-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/%{name}.jar
-install -m 644 jars/%{name}-cockpit-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/cockpit.jar
-install -m 644 jars/%{name}-cockpitlite-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/cockpitlite.jar
-install -m 644 jars/%{name}-gui-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/gui.jar
-install -m 644 jars/%{name}-synchronize-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/synchronize.jar
-install -m 644 jars/%{name}-uploader-%{version}.jar \
- %{buildroot}%{_javadir}/%{name}/uploader.jar
+%mvn_install
mkdir -p %{buildroot}%{_datadir}/%{name}/jars
(
cd %{buildroot}%{_javadir}
ln -sf ../../java/%{name}/%{name}.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-%{version}.jar
- ln -sf ../../java/%{name}/gui.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-gui-%{version}.jar
- ln -sf ../../java/%{name}/cockpit.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-cockpit-%{version}.jar
- ln -sf ../../java/%{name}/cockpitlite.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-cockpitlite-%{version}.jar
- ln -sf ../../java/%{name}/uploader.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-uploader-%{version}.jar
- ln -sf ../../java/%{name}/synchronize.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-synchronize-%{version}.jar
+ ln -sf ../../java/%{name}/%{name}.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-gui-%{version}.jar
)
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar
-install -pm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP.%{name}-gui.pom
-%add_maven_depmap JPP.%{name}-gui.pom %{name}/gui.jar
-install -pm 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP.%{name}-cockpit.pom
-%add_maven_depmap JPP.%{name}-cockpit.pom %{name}/cockpit.jar
-install -pm 644 %{SOURCE4} %{buildroot}%{_mavenpomdir}/JPP.%{name}-synchronize.pom
-%add_maven_depmap JPP.%{name}-synchronize.pom %{name}/synchronize.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr dist/api-docs/* %{buildroot}%{_javadocdir}/%{name}
-
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_datadir}/%{name}/bin
for TOOL in cockpit cockpitlite synchronize uploader
do
install -pm 755 scripts/$TOOL.sh %{buildroot}%{_bindir}/%{name}-$TOOL
ln -sf ../../../bin/%{name}-$TOOL %{buildroot}%{_datadir}/%{name}/bin/$TOOL.sh
+
+(
+ cd %{buildroot}%{_javadir}
+ ln -sf ../../java/%{name}/%{name}.jar %{buildroot}%{_datadir}/%{name}/jars/%{name}-$TOOL-%{version}.jar
+)
+
done
chmod 0755 %{buildroot}%{_datadir}/%{name}/bin/*
@@ -223,9 +232,8 @@ cp -pr servlets %{buildroot}%{_datadir}/%{name}/
%files -f .mfiles
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/cockpitlite.jar
-%{_javadir}/%{name}/uploader.jar
-%doc LICENSE-2.0.txt NOTICE.txt README.markdown RELEASE_NOTES.markdown
+%doc README.markdown RELEASE_NOTES.markdown
+%license LICENSE-2.0.txt NOTICE.txt
%files app
%dir %{_sysconfdir}/%{name}
@@ -245,11 +253,13 @@ cp -pr servlets %{buildroot}%{_datadir}/%{name}/
%{_mandir}/man1/*
%license LICENSE-2.0.txt NOTICE.txt
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
%license LICENSE-2.0.txt NOTICE.txt
%changelog
+* Sun Feb 15 2015 gil cattaneo <puntogil at libero.it> 0.9.3-1
+- update to 0.9.3
+
* Mon Feb 09 2015 gil cattaneo <puntogil at libero.it> 0.9.0-4
- introduce license macro
diff --git a/sources b/sources
index d4e028c..59a90b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f9e6035459f29425830997617e76092 jets3t-0.9.0-clean-src-hg.tar.gz
+0469de489e10414899651fd3205bf3df jets3t-0.9.3.tar.xz
More information about the scm-commits
mailing list