[jglobus/el5] Git snapshot
Mattias Ellert
ellert at fedoraproject.org
Sat Oct 13 23:18:23 UTC 2012
commit 55b9f4f63dcecd96d9cbdc928582e4338a95486d
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date: Sun Oct 14 01:05:23 2012 +0200
Git snapshot
jglobus-deps.patch | 103 ---------------------------------------------------
jglobus-junk.patch | 11 -----
jglobus.spec | 104 +++++++++++++++++++++++++++++++++++-----------------
sources | 2 +-
4 files changed, 71 insertions(+), 149 deletions(-)
---
diff --git a/jglobus.spec b/jglobus.spec
index e51adcb..088add7 100644
--- a/jglobus.spec
+++ b/jglobus.spec
@@ -1,6 +1,6 @@
Name: jglobus
Version: 2.0.4
-Release: 5%{?dist}
+Release: 9.20121013git597e3ac%{?dist}
Summary: Globus Java client libraries
# Everything is Apache 2.0 except for one file that is MIT:
@@ -11,15 +11,12 @@ URL: http://www.globus.org/toolkit/%{name}/
# 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
-# Adapting to tomcay 7
-Patch2: %{name}-tomcat7.patch
+# 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
BuildArch: noarch
@@ -39,7 +36,6 @@ BuildRequires: apache-commons-lang
BuildRequires: apache-commons-logging
BuildRequires: bouncycastle
BuildRequires: log4j
-BuildRequires: springframework
BuildRequires: tomcat-lib >= 7.0.28
%description
@@ -65,7 +61,6 @@ 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
@@ -110,7 +105,6 @@ 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
@@ -125,7 +119,6 @@ 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
@@ -143,6 +136,26 @@ Requires: tomcat-lib >= 7
%description ssl-proxies-tomcat
Globus Java library with SSL and proxy certificate support for Tomcat
+%package io
+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 javadoc
Summary: Javadocs for %{name}
License: ASL 2.0 and MIT
@@ -152,10 +165,8 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-git597e3ac
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
# Many tests requires network connections and a valid proxy certificate
@@ -163,38 +174,42 @@ mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 \
-Dmaven.test.skip=true install javadoc:aggregate
%install
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+mkdir -p %{buildroot}%{_javadir}/%{name}
install -p -m 644 ssl-proxies/target/ssl-proxies-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ssl-proxies.jar
+ %{buildroot}%{_javadir}/%{name}/ssl-proxies.jar
install -p -m 644 jsse/target/jsse-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/jsse.jar
+ %{buildroot}%{_javadir}/%{name}/jsse.jar
install -p -m 644 gss/target/gss-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/gss.jar
+ %{buildroot}%{_javadir}/%{name}/gss.jar
install -p -m 644 gram/target/gram-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/gram.jar
+ %{buildroot}%{_javadir}/%{name}/gram.jar
install -p -m 644 gridftp/target/gridftp-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/gridftp.jar
+ %{buildroot}%{_javadir}/%{name}/gridftp.jar
install -p -m 644 ssl-proxies-tomcat/target/ssl-proxies-tomcat-*.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}/ssl-proxies-tomcat.jar
+ %{buildroot}%{_javadir}/%{name}/ssl-proxies-tomcat.jar
+install -p -m 644 io/target/io-*.jar \
+ %{buildroot}%{_javadir}/%{name}/io.jar
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}
-cp -pr target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}
+cp -pr target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
-mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir}
+mkdir -p %{buildroot}%{_mavenpomdir}
install -p -m 644 pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
install -p -m 644 ssl-proxies/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-ssl-proxies.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-ssl-proxies.pom
install -p -m 644 jsse/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jsse.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-jsse.pom
install -p -m 644 gss/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-gss.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-gss.pom
install -p -m 644 gram/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-gram.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-gram.pom
install -p -m 644 gridftp/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-gridftp.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-gridftp.pom
install -p -m 644 ssl-proxies-tomcat/pom.xml \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-ssl-proxies-tomcat.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-ssl-proxies-tomcat.pom
+install -p -m 644 io/pom.xml \
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}-io.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
@@ -203,6 +218,7 @@ install -p -m 644 ssl-proxies-tomcat/pom.xml \
%add_maven_depmap -f gram JPP.%{name}-gram.pom %{name}/gram.jar
%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
%files parent
%{_mavenpomdir}/JPP.%{name}-parent.pom
@@ -239,10 +255,30 @@ install -p -m 644 ssl-proxies-tomcat/pom.xml \
%{_mavenpomdir}/JPP.%{name}-ssl-proxies-tomcat.pom
%{_mavendepmapfragdir}/%{name}-ssl-proxies-tomcat
+%files io
+%{_javadir}/%{name}/io.jar
+%{_mavenpomdir}/JPP.%{name}-io.pom
+%{_mavendepmapfragdir}/%{name}-io
+
%files javadoc
%doc %{_javadocdir}/%{name}
%changelog
+* Sat Oct 13 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-9.20121013git597e3ac
+- Git snapshot
+
+* Wed Oct 10 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-8.20121010git8eefd68
+- Git snapshot
+- Drop patches applied upstream
+
+* Wed Oct 10 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-7.20121010git5286c6b
+- Git snapshot
+- Drop patches applied upstream
+
+* Thu Sep 27 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-6
+- Drop spring framework dependency (based on pull request in github)
+- Allows building on EPEL
+
* Mon Aug 13 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.4-5
- Build the tomcat module
diff --git a/sources b/sources
index 21797b5..54b0a82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-daeaaa3a247ce1c72e051c9d54276ee5 jglobus-2.0.4.tar.gz
+605742bfb5c592b1424e482a5c53ff4d jglobus-2.0.4-git597e3ac.tar.gz
More information about the scm-commits
mailing list