rpms/glite-security-util-java/devel .cvsignore, 1.2, 1.3 glite-security-util-java.spec, 1.1, 1.2 sources, 1.2, 1.3 glite-security-util-java-external-classpath.patch, 1.1, NONE
stevetraylen
stevetraylen at fedoraproject.org
Wed Apr 28 17:51:55 UTC 2010
Author: stevetraylen
Update of /cvs/pkgs/rpms/glite-security-util-java/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11484/devel
Modified Files:
.cvsignore glite-security-util-java.spec sources
Removed Files:
glite-security-util-java-external-classpath.patch
Log Message:
Upstream to 2.5.5.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glite-security-util-java/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 13 Nov 2009 20:43:34 -0000 1.2
+++ .cvsignore 28 Apr 2010 17:51:55 -0000 1.3
@@ -1 +1 @@
-glite-security-util-java-2.0.3.tar.gz
+glite-security-util-java-2.5.5.tar.gz
Index: glite-security-util-java.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glite-security-util-java/devel/glite-security-util-java.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- glite-security-util-java.spec 13 Nov 2009 20:43:34 -0000 1.1
+++ glite-security-util-java.spec 28 Apr 2010 17:51:55 -0000 1.2
@@ -1,8 +1,8 @@
%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
Name: glite-security-util-java
-Version: 2.0.3
-Release: 7%{?dist}
+Version: 2.5.5
+Release: 1%{?dist}
Summary: Java Utilities for GSI Credentials
Group: System Environment/Libraries
@@ -11,20 +11,16 @@ URL: https://twiki.cern.ch/tw
# The source for this package was pulled from upstream's cvs. Use the
# following commands to generate the tarball:
# cvs -q -d:pserver:anonymous:@glite.cvs.cern.ch:/cvs/glite checkout \
-# -r glite-security-util-java_R_2_0_3 org.glite.security.util-java
+# -r glite-security-util-java_R_2_5_5 org.glite.security.util-java
# find org.glite.security.util-java -type f -print0 | xargs -0 chmod a-x
# find org.glite.security.util-java -name CVS -print0 | xargs -0 rm -rf
# rm -rf org.glite.security.util-java/src/org/glite/security/voms
# rm -rf org.glite.security.util-java/test
-# tar cvfz glite-security-util-java-2.0.3.tar.gz org.glite.security.util-java
+# tar cvfz glite-security-util-java-2.5.5.tar.gz org.glite.security.util-java
Source0: %{name}-%{version}.tar.gz
# The following script can be use to generate the source tar ball.
-# e.g bash ./glite-security-util-java-generate-tarball.sh 2.0.3
+# e.g bash ./glite-security-util-java-generate-tarball.sh 2.5.5
Source1: %{name}-generate-tarball.sh
-# Allow ant build.xml file to support an exterally set CLASSPATH.
-# Now fixed in CVS-HEAD as well.
-# https://savannah.cern.ch/bugs/?55583
-Patch0: %{name}-external-classpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{with_gcj}
@@ -35,12 +31,17 @@ Requires(postun): java-gcj-compat >= 1.0
BuildArch: noarch
%endif
+#No suitable java in EPEL5 on ppc
+%if 0%{?el5}
+ExcludeArch: ppc
+%endif
+
BuildRequires: jpackage-utils
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: ant
BuildRequires: bouncycastle
BuildRequires: log4j
-BuildRequires: servlet
+BuildRequires: servletapi5
BuildRequires: axis
BuildRequires: vomsjapi
@@ -49,7 +50,7 @@ Requires: java
Requires: bouncycastle
Requires: log4j
Requires: vomsjapi
-Requires: servlet
+Requires: servletapi5
Requires: axis
%description
@@ -76,7 +77,7 @@ This package contains the API documentat
%prep
%setup -q -n org.glite.security.util-java
-%patch0 -p1
+
# remove private copy of vomsjapi and use the provided package.
rm -rf src/org/glite/security/voms
sed s/org.glite.security.voms.VOMSValidator/org.glite.voms.VOMSValidator/ \
@@ -84,7 +85,7 @@ sed s/org.glite.security.voms.VOMSValida
find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
%build
-export CLASSPATH=$(build-classpath bcprov log4j axis servlet vomsjapi)
+export CLASSPATH=$(build-classpath bcprov log4j axis servletapi5 vomsjapi)
%ant -Dprefix=build compile-extcp
%ant -Dprefix=build doc-extcp
@@ -143,20 +144,34 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 28 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.5-1
+- Upstream to 2.5.5
+- Drop glite-security-util-java-external-classpath.patch since
+ now present upstream.
+- First build in EPEL5
+- Requires servletapi5 rather than servlet
+- Exclude arch ppc due to lack of suitable java on that platform.
+
* Thu Nov 12 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-7
- Correct typos in SPEC file.
+
* Sun Nov 9 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-6
- Don't use private vomsjapi and use vomsjapi package instead.
- Remove uneeded code and consequently "EU Datagrid license"
+
* Mon Oct 26 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-5
- Change summary field to something more sensible.
+
* Thu Oct 22 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-4
- Addition of axis and java-devel >= 1:1.6.0 as BR.
+
* Thu Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-3
- Shorten line length of description.
+
* Thu Sep 10 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-2
- Add patch to support external CLASSPATH env variable:
glite-security-external-classpath.patch
+
* Sun Sep 6 2009 Steve Traylen <steve.traylen at cern.ch> - 2.0.3-1
- Initial build.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glite-security-util-java/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 13 Nov 2009 20:43:34 -0000 1.2
+++ sources 28 Apr 2010 17:51:55 -0000 1.3
@@ -1 +1 @@
-eb40ab7da52d9e67561206f71258ecd0 glite-security-util-java-2.0.3.tar.gz
+541b1239df18cf6d03e4eeeb321304c3 glite-security-util-java-2.5.5.tar.gz
--- glite-security-util-java-external-classpath.patch DELETED ---
More information about the scm-commits
mailing list