[jglobus/f17] Add MIT license tag
Mattias Ellert
ellert at fedoraproject.org
Tue Apr 24 15:04:25 UTC 2012
commit f6d9c61414830a975685116fa20e9c5d0a7df273
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Tue Apr 24 17:03:50 2012 +0200
Add MIT license tag
.gitignore | 1 +
jglobus-deps.patch | 102 +++++++++++++++++++++++++
jglobus-junk.patch | 11 +++
jglobus.spec | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
5 files changed, 323 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..f6a3a77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/*.tar.gz
diff --git a/jglobus-deps.patch b/jglobus-deps.patch
new file mode 100644
index 0000000..801d320
--- /dev/null
+++ b/jglobus-deps.patch
@@ -0,0 +1,102 @@
+diff -ur jglobus-2.0.4.orig/gram/pom.xml jglobus-2.0.4/gram/pom.xml
+--- jglobus-2.0.4.orig/gram/pom.xml 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/gram/pom.xml 2012-04-21 08:23:17.760878995 +0200
+@@ -80,8 +80,8 @@
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+- <groupId>bouncycastle</groupId>
+- <artifactId>bcprov-jdk15</artifactId>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bcprov-jdk16</artifactId>
+ <version>140</version>
+ <type>jar</type>
+ <scope>compile</scope>
+diff -ur jglobus-2.0.4.orig/gridftp/pom.xml jglobus-2.0.4/gridftp/pom.xml
+--- jglobus-2.0.4.orig/gridftp/pom.xml 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/gridftp/pom.xml 2012-04-21 08:23:17.762879031 +0200
+@@ -57,8 +57,8 @@
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+- <groupId>bouncycastle</groupId>
+- <artifactId>bcprov-jdk15</artifactId>
++ <groupId>org.bouncycastle</groupId>
++ <artifactId>bcprov-jdk16</artifactId>
+ <version>140</version>
+ <type>jar</type>
+ <scope>compile</scope>
+diff -ur jglobus-2.0.4.orig/gss/pom.xml jglobus-2.0.4/gss/pom.xml
+--- jglobus-2.0.4.orig/gss/pom.xml 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/gss/pom.xml 2012-04-21 08:23:17.763879037 +0200
+@@ -43,7 +43,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+- <artifactId>bcprov-jdk15</artifactId>
++ <artifactId>bcprov-jdk16</artifactId>
+ <version>1.45</version>
+ </dependency>
+ <dependency>
+diff -ur jglobus-2.0.4.orig/pom.xml jglobus-2.0.4/pom.xml
+--- jglobus-2.0.4.orig/pom.xml 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/pom.xml 2012-04-21 14:42:22.314877954 +0200
+@@ -7,11 +7,11 @@
+ <artifactId>jglobus-all</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <modules>
++ <module>gram</module>
++ <module>gridftp</module>
+ <module>gss</module>
+ <module>jsse</module>
+ <module>ssl-proxies</module>
+- <module>test-utils</module>
+- <module>container-test-utils</module>
+ </modules>
+ <name>JGlobus 2.0</name>
+ <packaging>pom</packaging>
+diff -ur jglobus-2.0.4.orig/ssl-proxies/pom.xml jglobus-2.0.4/ssl-proxies/pom.xml
+--- jglobus-2.0.4.orig/ssl-proxies/pom.xml 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/ssl-proxies/pom.xml 2012-04-21 14:09:15.928539222 +0200
+@@ -38,7 +38,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+- <artifactId>bcprov-jdk15</artifactId>
++ <artifactId>bcprov-jdk16</artifactId>
+ <version>1.45</version>
+ </dependency>
+ <dependency>
+@@ -58,7 +58,7 @@
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+- <artifactId>org.springframework.core</artifactId>
++ <artifactId>spring-core</artifactId>
+ <version>3.0.1.RELEASE-A</version>
+ </dependency>
+ <dependency>
+diff -ur jglobus-2.0.4.orig/ssl-proxies-tomcat/pom.xml jglobus-2.0.4/ssl-proxies-tomcat/pom.xml
+--- jglobus-2.0.4.orig/ssl-proxies-tomcat/pom.xml 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/ssl-proxies-tomcat/pom.xml 2012-04-21 08:27:52.967107490 +0200
+@@ -25,17 +25,17 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+- <artifactId>catalina</artifactId>
++ <artifactId>tomcat-catalina</artifactId>
+ <version>6.0.24</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+- <artifactId>coyote</artifactId>
++ <artifactId>tomcat-coyote</artifactId>
+ <version>6.0.24</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+- <artifactId>bcprov-jdk15</artifactId>
++ <artifactId>bcprov-jdk16</artifactId>
+ <version>1.45</version>
+ </dependency>
+ <dependency>
diff --git a/jglobus-junk.patch b/jglobus-junk.patch
new file mode 100644
index 0000000..9f5875b
--- /dev/null
+++ b/jglobus-junk.patch
@@ -0,0 +1,11 @@
+--- jglobus-2.0.4.orig/ssl-proxies/src/main/java/org/globus/gsi/proxy/ext/ProxyCertInfo.java 2011-07-29 04:41:20.000000000 +0200
++++ jglobus-2.0.4/ssl-proxies/src/main/java/org/globus/gsi/proxy/ext/ProxyCertInfo.java 2012-04-15 20:46:40.940248247 +0200
+@@ -96,7 +96,7 @@
+ }
+
+ /**
+- * Returns an inÂstance of <code>ProxyCertInfo</code> from given object.
++ * Returns an instance of <code>ProxyCertInfo</code> from given object.
+ *
+ * @param obj the object to create the instance from.
+ * @return <code>ProxyCertInfo</code> instance.
diff --git a/jglobus.spec b/jglobus.spec
new file mode 100644
index 0000000..083abf3
--- /dev/null
+++ b/jglobus.spec
@@ -0,0 +1,208 @@
+Name: jglobus
+Version: 2.0.4
+Release: 2%{?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}/ --worktree-attributes \
+# JGlobus-%{version} | gzip > ../%{name}-%{version}.tar.gz
+Source0: %{name}-%{version}.tar.gz
+# Let maven find the Fedora supplied versions of dependencies
+Patch0: %{name}-deps.patch
+# Remove a junk character in a comment that upsets javadoc
+Patch1: %{name}-junk.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-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: springframework
+
+%description
+%{name} is a collection of Java client libraries for Globus Toolkit security,
+GRAM and GridFTP.
+
+%package ssl-proxies
+Summary: Globus Java - SSL and proxy certificate support
+License: ASL 2.0 and MIT
+Requires: jpackage-utils
+Requires: java
+Requires: apache-commons-codec
+Requires: apache-commons-io
+Requires: apache-commons-lang
+Requires: apache-commons-logging
+Requires: bouncycastle
+Requires: log4j
+Requires: springframework
+
+%description ssl-proxies
+Globus Java library with SSL and proxy certificate support
+
+%package jsse
+Summary: Globus Java - SSL support
+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
+
+%package gss
+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
+
+%package gram
+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
+Requires: springframework
+
+%description gram
+Globus Java library with GRAM support
+
+%package gridftp
+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
+Requires: springframework
+
+%description gridftp
+Globus Java library with GridFTP support
+
+%package javadoc
+Summary: Javadocs for %{name}
+License: ASL 2.0 and MIT
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+
+%build
+# Many tests requires network connections and a valid proxy certificate
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 \
+ -Dmaven.test.skip=true install javadoc:aggregate
+
+%install
+mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -p -m 644 ssl-proxies/target/ssl-proxies-*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/ssl-proxies.jar
+install -p -m 644 jsse/target/jsse-*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/jsse.jar
+install -p -m 644 gss/target/gss-*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/gss.jar
+install -p -m 644 gram/target/gram-*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/gram.jar
+install -p -m 644 gridftp/target/gridftp-*.jar \
+ $RPM_BUILD_ROOT%{_javadir}/%{name}/gridftp.jar
+
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
+cp -pr target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+install -p -m 644 pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-%{name}-all.pom
+install -p -m 644 ssl-proxies/pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-ssl-proxies.pom
+install -p -m 644 jsse/pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jsse.pom
+install -p -m 644 gss/pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-gss.pom
+install -p -m 644 gram/pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-gram.pom
+install -p -m 644 gridftp/pom.xml \
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-gridftp.pom
+
+%add_maven_depmap JPP.%{name}-%{name}-all.pom
+%add_maven_depmap JPP.%{name}-ssl-proxies.pom %{name}/ssl-proxies.jar
+%add_maven_depmap JPP.%{name}-jsse.pom %{name}/jsse.jar
+%add_maven_depmap JPP.%{name}-gss.pom %{name}/gss.jar
+%add_maven_depmap JPP.%{name}-gram.pom %{name}/gram.jar
+%add_maven_depmap JPP.%{name}-gridftp.pom %{name}/gridftp.jar
+
+%files ssl-proxies
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/ssl-proxies.jar
+%{_mavenpomdir}/JPP.%{name}-ssl-proxies.pom
+%{_mavenpomdir}/JPP.%{name}-%{name}-all.pom
+%{_mavendepmapfragdir}/%{name}
+
+%files jsse
+%{_javadir}/%{name}/jsse.jar
+%{_mavenpomdir}/JPP.%{name}-jsse.pom
+
+%files gss
+%{_javadir}/%{name}/gss.jar
+%{_mavenpomdir}/JPP.%{name}-gss.pom
+
+%files gram
+%{_javadir}/%{name}/gram.jar
+%{_mavenpomdir}/JPP.%{name}-gram.pom
+
+%files gridftp
+%{_javadir}/%{name}/gridftp.jar
+%{_mavenpomdir}/JPP.%{name}-gridftp.pom
+
+%files javadoc
+%doc %{_javadocdir}/%{name}
+
+%changelog
+* Mon Apr 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-2
+- Add MIT license tag
+
+* Fri Apr 13 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-1
+- First packaging
diff --git a/sources b/sources
index e69de29..21797b5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+daeaaa3a247ce1c72e051c9d54276ee5 jglobus-2.0.4.tar.gz
More information about the scm-commits
mailing list