rpms/voms-api-java
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build against bouncycastle1.58

Browse source 
Update to version 3.3.0 - matches canl-java 2.5.x
Drop patch voms-api-java-canl-2.5.patch
This commit is contained in:
Mattias Ellert 2018-02-08 17:56:38 +01:00
commit dd32df4992
5 changed files with 44 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

25
voms-api-java.spec
View file

@ -1,11 +1,11 @@
Name: voms-api-java
Version: 3.2.0
Release: 7%{?dist}
Version: 3.3.0
Release: 1%{?dist}
Summary: Virtual Organization Membership Service Java API
License: ASL 2.0
URL: https://wiki.italiangrid.it/VOMS
Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz
Source0: https://github.com/italiangrid/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
# These are build instructions for ant generated from the maven
# build instructions using the maven ant plugin.
# These are used for building on EPEL 6 since there is no maven
@ -15,15 +15,15 @@ Source2: maven-build.xml
Source3: maven-build.properties
# Disable tests using non-local network interface
Patch0: %{name}-no-local.patch
# Adapt to canl-java version 2.5
Patch1: %{name}-canl-2.5.patch
BuildArch: noarch
# There is no jakarta-commons-io for ppc64 in EPEL6
ExcludeArch: ppc64
BuildRequires: java-devel >= 1:1.6
BuildRequires: java-1.8.0-openjdk-devel
BuildRequires: jpackage-utils
BuildRequires: ant
BuildRequires: canl-java >= 2.5
Requires: java >= 1:1.6
Requires: java >= 1:1.8
Requires: jpackage-utils
Requires: canl-java >= 2.5
Provides: voms-api-java3 = %{version}-%{release}
@ -41,6 +41,7 @@ This package provides a java client API for VOMS.
%package javadoc
Summary: Virtual Organization Membership Service Java API Documentation
Requires: jpackage-utils
Provides: voms-api-java3-javadoc = %{version}-%{release}
Obsoletes: voms-api-java3-javadoc < 3.1
@ -50,13 +51,12 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
cp -p %{SOURCE3} .
%build
export CLASSPATH=$(build-classpath bcprov bcpkix commons-io canl)
export CLASSPATH=$(build-classpath bcprov-1.58 bcpkix-1.58 commons-io canl)
# The tests use mockito which is not available in EPEL 6 - skipping tests
%ant -Dbuild.sysclasspath=last -Dmaven.test.skip=true package javadoc
@ -81,7 +81,7 @@ cp -pr target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
%files
%{_javadir}/%{name}.jar
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%config(noreplace) %{_mavendepmapfragdir}/%{name}
%doc AUTHORS README.md
%license LICENSE
@ -90,6 +90,11 @@ cp -pr target/site/apidocs %{buildroot}%{_javadocdir}/%{name}
%license LICENSE
%changelog
* Thu Feb 08 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.3.0-1
- Build against bouncycastle1.58
- Update to version 3.3.0 - matches canl-java 2.5.x
- Drop patch voms-api-java-canl-2.5.patch
* Thu Jan 11 2018 Mattias Ellert <mattias.ellert@physics.uu.se> - 3.2.0-7
- Add Provides/Obsoletes voms-api-java3-javadoc