[jglobus/f17] 2.0.5 release candidate 2
Mattias Ellert
ellert at fedoraproject.org
Thu Jan 31 14:09:57 UTC 2013
commit 062e481d598cbf5ab097b75c32fde78b2d7372e0
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Thu Jan 31 14:59:15 2013 +0100
2.0.5 release candidate 2
- New jglobus-myproxy package
- New jglobus-axisg package
jglobus-tomcat7.patch | 81 -------------------------------
jglobus.spec | 129 +++++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 73 insertions(+), 139 deletions(-)
---
diff --git a/jglobus.spec b/jglobus.spec
index 088add7..1008830 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -1,46 +1,41 @@
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
-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
-# Adapting to tomcat 7
-Patch0: %{name}-tomcat7.patch
+URL: http://github.com/%{name}/
+Source0: http://github.com/%{name}/JGlobus/archive/%{name}-all-%{version}-rc2.tar.gz
BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel
+BuildRequires: dos2unix
BuildRequires: maven
BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-patch-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-resources-plugin
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-io
-BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
BuildRequires: bouncycastle
BuildRequires: log4j
BuildRequires: tomcat-lib >= 7.0.28
+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 parent
Summary: Globus Java - parent pom file
@@ -55,9 +50,9 @@ Summary: Globus Java - SSL and proxy certificate support
License: ASL 2.0 and MIT
Requires: jpackage-utils
Requires: java
+Requires: %{name}-parent = %{version}-%{release}
Requires: apache-commons-codec
Requires: apache-commons-io
-Requires: apache-commons-lang
Requires: apache-commons-logging
Requires: bouncycastle
Requires: log4j
@@ -71,9 +66,6 @@ License: ASL 2.0
Requires: jpackage-utils
Requires: java
Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: apache-commons-codec
-Requires: apache-commons-logging
-Requires: log4j
%description jsse
Globus Java library with SSL support
@@ -83,14 +75,7 @@ Summary: Globus Java - GSS-API implementation for SSL with proxies
License: ASL 2.0
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
Requires: %{name}-jsse = %{version}-%{release}
-Requires: apache-commons-codec
-Requires: apache-commons-io
-Requires: apache-commons-lang
-Requires: apache-commons-logging
-Requires: bouncycastle
-Requires: log4j
%description gss
Globus Java GSS-API implementation for SSL with proxies
@@ -100,11 +85,7 @@ Summary: Globus Java - Grid Resource Allocation and Management (GRAM)
License: ASL 2.0
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: %{name}-jsse = %{version}-%{release}
Requires: %{name}-gss = %{version}-%{release}
-Requires: apache-commons-logging
-Requires: bouncycastle
%description gram
Globus Java library with GRAM support
@@ -114,11 +95,7 @@ Summary: Globus Java - GridFTP
License: ASL 2.0
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
-Requires: %{name}-jsse = %{version}-%{release}
Requires: %{name}-gss = %{version}-%{release}
-Requires: apache-commons-logging
-Requires: bouncycastle
%description gridftp
Globus Java library with GridFTP support
@@ -128,9 +105,7 @@ Summary: Globus Java - SSL and proxy certificate support for Tomcat
License: ASL 2.0
Requires: jpackage-utils
Requires: java
-Requires: %{name}-ssl-proxies = %{version}-%{release}
Requires: %{name}-jsse = %{version}-%{release}
-Requires: bouncycastle
Requires: tomcat-lib >= 7
%description ssl-proxies-tomcat
@@ -141,21 +116,34 @@ Summary: Globus Java - IO
License: ASL 2.0
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: apache-commons-codec
-Requires: apache-commons-io
-Requires: apache-commons-lang
-Requires: apache-commons-logging
-Requires: bouncycastle
-Requires: log4j
%description io
Globus Java library with IO utilities
+%package myproxy
+Summary: Globus Java - MyProxy
+License: ASL 2.0
+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
+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
@@ -165,30 +153,35 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-%{version}-git597e3ac
-%patch0 -p1
+%setup -q -n JGlobus-%{name}-all-%{version}-rc2
+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
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 \
+mvn-rpmbuild -Ptomcat7 -Dproject.build.sourceEncoding=UTF-8 \
-Dmaven.test.skip=true install javadoc:aggregate
%install
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}-rc2.jar \
%{buildroot}%{_javadir}/%{name}/ssl-proxies.jar
-install -p -m 644 jsse/target/jsse-*.jar \
+install -p -m 644 jsse/target/jsse-%{version}-rc2.jar \
%{buildroot}%{_javadir}/%{name}/jsse.jar
-install -p -m 644 gss/target/gss-*.jar \
+install -p -m 644 gss/target/gss-%{version}-rc2.jar \
%{buildroot}%{_javadir}/%{name}/gss.jar
-install -p -m 644 gram/target/gram-*.jar \
+install -p -m 644 gram/target/gram-%{version}-rc2.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}-rc2.jar \
+ %{buildroot}%{_javadir}/%{name}/gridftp.jar
+install -p -m 644 ssl-proxies-tomcat/target/ssl-proxies-tomcat-%{version}-rc2.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}-rc2.jar \
+ %{buildroot}%{_javadir}/%{name}/io.jar
+install -p -m 644 myproxy/target/myproxy-%{version}-rc2.jar \
+ %{buildroot}%{_javadir}/%{name}/myproxy.jar
+install -p -m 644 axis/target/axisg-%{version}-rc2.jar \
+ %{buildroot}%{_javadir}/%{name}/axisg.jar
mkdir -p %{buildroot}%{_javadocdir}
cp -pr target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
@@ -210,6 +203,10 @@ install -p -m 644 ssl-proxies-tomcat/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-ssl-proxies-tomcat.pom
install -p -m 644 io/pom.xml \
%{buildroot}%{_mavenpomdir}/JPP.%{name}-io.pom
+install -p -m 644 myproxy/pom.xml \
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-myproxy.pom
+install -p -m 644 axis/pom.xml \
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-axisg.pom
%add_maven_depmap -f parent JPP.%{name}-parent.pom
%add_maven_depmap -f ssl-proxies JPP.%{name}-ssl-proxies.pom %{name}/ssl-proxies.jar
@@ -219,6 +216,8 @@ install -p -m 644 io/pom.xml \
%add_maven_depmap -f gridftp JPP.%{name}-gridftp.pom %{name}/gridftp.jar
%add_maven_depmap -f ssl-proxies-tomcat JPP.%{name}-ssl-proxies-tomcat.pom %{name}/ssl-proxies-tomcat.jar
%add_maven_depmap -f io JPP.%{name}-io.pom %{name}/io.jar
+%add_maven_depmap -f myproxy JPP.%{name}-myproxy.pom %{name}/myproxy.jar
+%add_maven_depmap -f axisg JPP.%{name}-axisg.pom %{name}/axisg.jar
%files parent
%{_mavenpomdir}/JPP.%{name}-parent.pom
@@ -260,10 +259,26 @@ install -p -m 644 io/pom.xml \
%{_mavenpomdir}/JPP.%{name}-io.pom
%{_mavendepmapfragdir}/%{name}-io
+%files myproxy
+%{_javadir}/%{name}/myproxy.jar
+%{_mavenpomdir}/JPP.%{name}-myproxy.pom
+%{_mavendepmapfragdir}/%{name}-myproxy
+
+%files axisg
+%{_javadir}/%{name}/axisg.jar
+%{_mavenpomdir}/JPP.%{name}-axisg.pom
+%{_mavendepmapfragdir}/%{name}-axisg
+%doc axis/src/main/java/org/globus/axis/example/README.txt
+
%files javadoc
%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 54b0a82..733d9b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-605742bfb5c592b1424e482a5c53ff4d jglobus-2.0.4-git597e3ac.tar.gz
+a47c80956c4196cc28fcd00c80e95ef8 jglobus-all-2.0.5-rc2.tar.gz
More information about the scm-commits
mailing list