[jglobus/el5] 2.0.5 release candidate 2
Mattias Ellert
ellert at fedoraproject.org
Thu Jan 31 14:09:42 UTC 2013
commit 64427a3f3e10f4b10837bdd9b0a9de4ba8410b67
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Jan 31 15:07:37 2013 +0100
2.0.5 release candidate 2
- New jglobus-myproxy package
- New jglobus-axisg package
jglobus-tomcat5.patch | 64 ------------------------
jglobus.spec | 130 ++++++++++++++++++++++++------------------------
sources | 4 +-
3 files changed, 67 insertions(+), 131 deletions(-)
---
diff --git a/jglobus.spec b/jglobus.spec
index d1daacc..15f95c6 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -6,33 +6,25 @@
%if "%{rhel}" == "5"
%global tomcat tomcat5
%global tomcatlib tomcat5-server-lib
+%global tomcatutil %{tomcat}/tomcat-util
%else
%global tomcat tomcat6
%global tomcatlib tomcat6-lib
%endif
Name: jglobus
-Version: 2.0.4
-Release: 9.20121013git597e3ac%{?dist}
+Version: 2.0.5
+Release: 0.1.rc2%{?dist}
Summary: Globus Java client libraries
# Everything is Apache 2.0 except for one file that is MIT:
# ssl-proxies/src/main/java/org/globus/tools/GridCertRequest.java
License: ASL 2.0 and MIT
Group: Development/Libraries
-URL: http://www.globus.org/toolkit/%{name}/
-# Source generated from a git checkout:
-# git clone http://github.com/%{name}/JGlobus
-# cd JGlobus
-# echo '*.jar export-ignore' > .gitattributes
-# git archive --prefix %{name}-%{version}-git597e3ac/ \
-# --worktree-attributes \
-# 597e3ac | gzip > ../%{name}-%{version}-git597e3ac.tar.gz
-Source0: %{name}-%{version}-git597e3ac.tar.gz
+URL: http://github.com/%{name}/
+Source0: http://github.com/%{name}/JGlobus/archive/%{name}-all-%{version}-rc2.tar.gz
# Build with ant on old distributions
Source1: %{name}-ant-%{version}.tar.gz
-# Adapting to tomcat 5
-Patch0: %{name}-tomcat5.patch
BuildArch: noarch
# There is no bouncycastle for ppc in EPEL5 abd ppc64 in EPEL6
@@ -41,19 +33,21 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: jpackage-utils
BuildRequires: java-devel
+BuildRequires: dos2unix
BuildRequires: ant
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-io
-BuildRequires: jakarta-commons-lang
BuildRequires: jakarta-commons-logging
BuildRequires: bouncycastle
BuildRequires: log4j
BuildRequires: %{tomcatlib}
+BuildRequires: axis
+BuildRequires: servlet
%description
%{name} is a collection of Java client libraries for Globus Toolkit security,
-GRAM and GridFTP.
+GRAM, GridFTP and MyProxy.
%package ssl-proxies
Summary: Globus Java - SSL and proxy certificate support
@@ -63,7 +57,6 @@ Requires: jpackage-utils
Requires: java
Requires: jakarta-commons-codec
Requires: jakarta-commons-io
-Requires: jakarta-commons-lang
Requires: jakarta-commons-logging
Requires: bouncycastle
Requires: log4j
@@ -78,9 +71,6 @@ Group: Development/Libraries
Requires: jpackage-utils
Requires: java
Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: jakarta-commons-codec
-Requires: jakarta-commons-logging
-Requires: log4j
%description jsse
Globus Java library with SSL support
@@ -91,14 +81,7 @@ License: ASL 2.0
Group: Development/Libraries
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
Requires: %{name}-jsse = %{version}-%{release}
-Requires: jakarta-commons-codec
-Requires: jakarta-commons-io
-Requires: jakarta-commons-lang
-Requires: jakarta-commons-logging
-Requires: bouncycastle
-Requires: log4j
%description gss
Globus Java GSS-API implementation for SSL with proxies
@@ -109,11 +92,7 @@ License: ASL 2.0
Group: Development/Libraries
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: %{name}-jsse = %{version}-%{release}
Requires: %{name}-gss = %{version}-%{release}
-Requires: jakarta-commons-logging
-Requires: bouncycastle
%description gram
Globus Java library with GRAM support
@@ -124,11 +103,7 @@ License: ASL 2.0
Group: Development/Libraries
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: %{name}-jsse = %{version}-%{release}
Requires: %{name}-gss = %{version}-%{release}
-Requires: jakarta-commons-logging
-Requires: bouncycastle
%description gridftp
Globus Java library with GridFTP support
@@ -139,9 +114,7 @@ License: ASL 2.0
Group: Development/Libraries
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
Requires: %{name}-jsse = %{version}-%{release}
-Requires: bouncycastle
Requires: %{tomcatlib}
%description ssl-proxies-tomcat
@@ -153,21 +126,36 @@ License: ASL 2.0
Group: Development/Libraries
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: %{name}-jsse = %{version}-%{release}
-Requires: %{name}-gss = %{version}-%{release}
Requires: %{name}-gram = %{version}-%{release}
Requires: %{name}-gridftp = %{version}-%{release}
-Requires: jakarta-commons-codec
-Requires: jakarta-commons-io
-Requires: jakarta-commons-lang
-Requires: jakarta-commons-logging
-Requires: bouncycastle
-Requires: log4j
%description io
Globus Java library with IO utilities
+%package myproxy
+Summary: Globus Java - MyProxy
+License: ASL 2.0
+Group: Development/Libraries
+Requires: jpackage-utils
+Requires: java
+Requires: %{name}-gss = %{version}-%{release}
+
+%description myproxy
+Globus Java library with MyProxy support
+
+%package axisg
+Summary: Globus Java - Apache AXIS support
+License: ASL 2.0
+Group: Development/Libraries
+Requires: jpackage-utils
+Requires: java
+Requires: %{name}-gss = %{version}-%{release}
+Requires: axis
+Requires: servlet
+
+%description axisg
+Globus Java library with Apache AXIS support
+
%package javadoc
Summary: Javadocs for %{name}
License: ASL 2.0 and MIT
@@ -178,33 +166,39 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -a 1 -n %{name}-%{version}-git597e3ac
+%setup -q -a 1 -n JGlobus-%{name}-all-%{version}-rc2
%if "%{rhel}" == "5"
-%patch0 -p1
+patch -p1 < ssl-proxies-tomcat/src/main/patches/jglobus-tomcat5.patch
%endif
+dos2unix axis/src/main/java/org/globus/axis/example/README.txt
+chmod 644 axis/src/main/java/org/globus/axis/example/README.txt
%build
# Many tests requires network connections and a valid proxy certificate
-export CLASSPATH=$(build-classpath bcprov log4j commons-codec commons-io commons-lang commons-logging %{tomcat}/catalina %{tomcat}/tomcat-coyote %{tomcat}/tomcat-util):ssl-proxies/target/ssl-proxies-2.0-SNAPSHOT.jar:jsse/target/jsse-2.0-SNAPSHOT.jar:gss/target/gss-2.0-SNAPSHOT.jar:gram/target/gram-2.0-SNAPSHOT.jar:gridftp/target/gridftp-2.0-SNAPSHOT.jar
+export CLASSPATH=$(build-classpath bcprov log4j commons-codec commons-httpclient commons-io commons-logging %{tomcat}/catalina %{tomcat}/tomcat-coyote %{?tomcatutil} axis/axis axis/jaxrpc servlet):ssl-proxies/target/ssl-proxies-%{version}.jar:jsse/target/jsse-%{version}.jar:gss/target/gss-%{version}.jar:gram/target/gram-%{version}.jar:gridftp/target/gridftp-%{version}.jar
ant -Dmaven.test.skip=true package javadoc
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_javadir}/%{name}
-install -p -m 644 ssl-proxies/target/ssl-proxies-*.jar \
+install -p -m 644 ssl-proxies/target/ssl-proxies-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/ssl-proxies.jar
-install -p -m 644 jsse/target/jsse-*.jar \
+install -p -m 644 jsse/target/jsse-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/jsse.jar
-install -p -m 644 gss/target/gss-*.jar \
+install -p -m 644 gss/target/gss-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/gss.jar
-install -p -m 644 gram/target/gram-*.jar \
+install -p -m 644 gram/target/gram-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/gram.jar
-install -p -m 644 gridftp/target/gridftp-*.jar \
- %{buildroot}%{_javadir}/%{name}/gridftp.jar
-install -p -m 644 ssl-proxies-tomcat/target/ssl-proxies-tomcat-*.jar \
+install -p -m 644 gridftp/target/gridftp-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/gridftp.jar
+install -p -m 644 ssl-proxies-tomcat/target/ssl-proxies-tomcat-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/ssl-proxies-tomcat.jar
-install -p -m 644 io/target/io-*.jar \
- %{buildroot}%{_javadir}/%{name}/io.jar
+install -p -m 644 io/target/io-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/io.jar
+install -p -m 644 myproxy/target/myproxy-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/myproxy.jar
+install -p -m 644 axis/target/axisg-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}/axisg.jar
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -pr ssl-proxies/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/ssl-proxies
@@ -214,44 +208,50 @@ cp -pr gram/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/gram
cp -pr gridftp/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/gridftp
cp -pr ssl-proxies-tomcat/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/ssl-proxies-tomcat
cp -pr io/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/io
+cp -pr myproxy/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/myproxy
+cp -pr axis/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/axisg
%clean
rm -rf %{buildroot}
%files ssl-proxies
-%defattr(-,root,root,-)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/ssl-proxies.jar
%files jsse
-%defattr(-,root,root,-)
%{_javadir}/%{name}/jsse.jar
%files gss
-%defattr(-,root,root,-)
%{_javadir}/%{name}/gss.jar
%files gram
-%defattr(-,root,root,-)
%{_javadir}/%{name}/gram.jar
%files gridftp
-%defattr(-,root,root,-)
%{_javadir}/%{name}/gridftp.jar
%files ssl-proxies-tomcat
-%defattr(-,root,root,-)
%{_javadir}/%{name}/ssl-proxies-tomcat.jar
%files io
-%defattr(-,root,root,-)
%{_javadir}/%{name}/io.jar
+%files myproxy
+%{_javadir}/%{name}/myproxy.jar
+
+%files axisg
+%{_javadir}/%{name}/axisg.jar
+%doc axis/src/main/java/org/globus/axis/example/README.txt
+
%files javadoc
-%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%changelog
+* Tue Jan 29 2013 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.5-0.1.rc2
+- 2.0.5 release candidate 2
+- New jglobus-myproxy package
+- New jglobus-axisg package
+
* Sat Oct 13 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-9.20121013git597e3ac
- Git snapshot
diff --git a/sources b/sources
index 1e9ad2d..0ee4cd2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-605742bfb5c592b1424e482a5c53ff4d jglobus-2.0.4-git597e3ac.tar.gz
-1347c43b9fd3dc2022b698fbf35edb42 jglobus-ant-2.0.4.tar.gz
+a47c80956c4196cc28fcd00c80e95ef8 jglobus-all-2.0.5-rc2.tar.gz
+2ae4560f2e376e4ba9ad556ceb249d51 jglobus-ant-2.0.5.tar.gz
More information about the scm-commits
mailing list