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

Update to version 3.2.0 - matches canl-java 2.2.x

Browse source 
- Drop patches: voms-api-java-bc147.patch, -javadoc.patch and -testfix.patch
This commit is contained in:
Mattias Ellert 2016-02-14 15:58:56 +01:00
commit 0f44f3f540
5 changed files with 9 additions and 889 deletions
Download patch file Download diff file Expand all files Collapse all files

38
voms-api-java.spec
View file

@ -1,36 +1,22 @@
Name: voms-api-java
Version: 3.0.5
Release: 5%{?dist}
Version: 3.2.0
Release: 1%{?dist}
Summary: Virtual Organization Membership Service Java API
Group: Development/Libraries
License: ASL 2.0
URL: https://wiki.italiangrid.it/VOMS
Source0: https://github.com/italiangrid/%{name}/archive/v%{version}.tar.gz
# Patch for bouncycastle 1.47+ (Fedora 21+, EPEL 7+)
Patch0: %{name}-bc147.patch
# Disable tests using non-local network interface
Patch1: %{name}-no-local.patch
# Fix javadoc warnings/errors
Patch2: %{name}-javadoc.patch
# Modify test for canl-java 2.2.0 (Backport from upstream)
Patch3: %{name}-testfix.patch
Patch0: %{name}-no-local.patch
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-release-plugin)
BuildRequires: mvn(eu.eu-emi.security:canl)
BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.mockito:mockito-core)
%if %{?fedora}%{!?fedora:0}
# Missing in EPEL
BuildRequires: mvn(com.mycila.maven-license-plugin:maven-license-plugin)
BuildRequires: mvn(net.jcip:jcip-annotations)
%endif
%description
The Virtual Organization Membership Service (VOMS) is an attribute authority
@ -52,29 +38,17 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:groupId" "org.bouncycastle"
%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:artifactId='bcmail']/pom:artifactId" "bcpkix-jdk15on"
%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin
%if %{?fedora}%{!?fedora:0}
%pom_xpath_inject "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:excludes" "<exclude>.xmvn/**</exclude>"
%pom_xpath_remove "pom:project/pom:build/pom:plugins/pom:plugin[pom:groupId='com.mycila.maven-license-plugin']/pom:configuration/pom:strictCheck"
%else
# Missing in EPEL
%pom_remove_plugin com.mycila.maven-license-plugin:maven-license-plugin
%pom_remove_dep net.jcip:jcip-annotations
%endif
%build
%mvn_build
%install
%mvn_install -J target/site/javadoc/apidocs
%mvn_install
%files -f .mfiles
%doc AUTHORS README.md
@ -84,6 +58,10 @@ Virtual Organization Membership Service (VOMS) Java API Documentation.
%license LICENSE
%changelog
* Sun Feb 14 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 3.2.0-1
- Update to version 3.2.0 - matches canl-java 2.2.x
- Drop patches: voms-api-java-bc147.patch, -javadoc.patch and -testfix.patch
* Thu Feb 11 2016 Mattias Ellert <mattias.ellert@fysast.uu.se> - 3.0.5-5
- Backport fix for failing test due to new canl-java version