Update to version 2.0.9

This commit is contained in:
Mattias Ellert 2012-11-30 08:46:08 +01:00
commit 8277db81ae
4 changed files with 48 additions and 22 deletions

View file

@ -6,8 +6,8 @@
%endif
Name: voms-api-java
Version: 2.0.8
Release: 2%{?dist}
Version: 2.0.9
Release: 1%{?dist}
Summary: Virtual Organization Membership Service Java API
Group: Development/Libraries
@ -16,8 +16,8 @@ URL: http://glite.web.cern.ch/glite/
# This source tarball is created from a git checkout:
# git clone git://github.com/italiangrid/voms-api-java.git
# cd voms-api-java
# git archive --format tar --prefix voms-api-java-2.0.8/ 2_0_8 \
# | gzip - > ../voms-api-java-2.0.8.tar.gz
# git archive --format tar.gz --prefix voms-api-java-2.0.9/ \
# 2_0_9 > ../voms-api-java-2.0.9.tar.gz
Source0: %{name}-%{version}.tar.gz
# These are build instructions for ant generated from the maven
# build instrutions using the maven ant plugin.
@ -40,8 +40,15 @@ ExcludeArch: ppc64
Requires: java
Requires: jpackage-utils
Requires: bouncycastle >= 1.39
%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
Requires: apache-commons-cli
Requires: apache-commons-io
Requires: apache-commons-lang
%else
Requires: jakarta-commons-cli
Requires: jakarta-commons-io
Requires: jakarta-commons-lang
%endif
Requires: log4j
Provides: vomsjapi = %{version}-%{release}
@ -66,8 +73,15 @@ BuildRequires: ant-junit
%endif
BuildRequires: bouncycastle >= 1.39
%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-io
BuildRequires: apache-commons-lang
%else
BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-io
BuildRequires: jakarta-commons-lang
%endif
BuildRequires: log4j
%description
@ -97,14 +111,14 @@ install -m 644 %SOURCE1 .
install -m 644 %SOURCE2 .
install -m 644 %SOURCE3 .
sed -e s/bcprov-ext-jdk16/bcprov-jdk16/ -e s/1.45/1.46/ -i pom.xml
sed -e s/bcprov-ext-jdk16/bcprov-jdk16/ -i pom.xml
%build
%if %{maven}
mvn-rpmbuild install javadoc:aggregate
mvn-rpmbuild -Dbouncycastle.version=1.46 install javadoc:aggregate
%else
export CLASSPATH=$(build-classpath bcprov log4j commons-cli commons-lang)
ant package javadoc
export CLASSPATH=$(build-classpath bcprov log4j commons-cli commons-io commons-lang)
ant -Dbuild.sysclasspath=last package javadoc
%endif
%install
@ -137,13 +151,16 @@ rm -rf $RPM_BUILD_ROOT
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%endif
%doc AUTHORS LICENSE
%doc AUTHORS LICENSE README.md
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}
%changelog
* Thu Nov 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.0.9-1
- Update to version 2.0.9
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild