diff --git a/voms-api-java.spec b/voms-api-java.spec index 4614b75..42c416f 100644 --- a/voms-api-java.spec +++ b/voms-api-java.spec @@ -7,12 +7,12 @@ Name: voms-api-java Version: 2.0.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Virtual Organization Membership Service Java API Group: Development/Libraries License: ASL 2.0 -URL: http://glite.web.cern.ch/glite/ +URL: https://wiki.italiangrid.it/VOMS # This source tarball is created from a git checkout: # git clone git://github.com/italiangrid/voms-api-java.git # cd voms-api-java @@ -42,11 +42,9 @@ 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 @@ -122,26 +120,26 @@ ant -Dbuild.sysclasspath=last package javadoc %endif %install -mkdir -p $RPM_BUILD_ROOT%{_javadir} +mkdir -p %{buildroot}%{_javadir} install -m 644 target/%{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar -ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/vomsjapi.jar + %{buildroot}%{_javadir}/%{name}.jar +ln -s %{name}.jar %{buildroot}%{_javadir}/vomsjapi.jar -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} +mkdir -p %{buildroot}%{_javadocdir}/%{name} %if %{maven} -cp -pr target/site/javadoc/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/javadoc/apidocs %{buildroot}%{_javadocdir}/%{name} %else -cp -pr target/site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs %{buildroot}%{_javadocdir}/%{name} %endif %if %{maven} -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +mkdir -p %{buildroot}%{_mavenpomdir} +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a org.glite:vomsjapi %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root,-) @@ -158,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT %doc %{_javadocdir}/%{name} %changelog +* Sun Dec 02 2012 Mattias Ellert - 2.0.9-2 +- Correct runtime requires and URL tag + * Thu Nov 29 2012 Mattias Ellert - 2.0.9-1 - Update to version 2.0.9