diff --git a/avalon-framework.spec b/avalon-framework.spec index 33b1556..0a437e4 100644 --- a/avalon-framework.spec +++ b/avalon-framework.spec @@ -33,7 +33,7 @@ Name: avalon-%{short_name} Version: 4.3 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 0 Summary: Java components interfaces License: ASL 2.0 @@ -104,7 +104,7 @@ export CLASSPATH=%(build-classpath avalon-logkit junit commons-logging log4j) export CLASSPATH="$CLASSPATH:../target/%{name}-api-%{version}.jar" ant jar test javadoc # Convert to OSGi bundle -java -jar $(build-classpath aqute-bnd) wrap target/%{name}-api-%{version}.jar +bnd wrap target/%{name}-api-%{version}.jar # build implementation now pushd %{name}-impl-%{version} @@ -112,14 +112,14 @@ pushd %{name}-impl-%{version} rm -rf src/test/* ant jar javadoc # Convert to OSGi bundle -java -jar $(build-classpath aqute-bnd) wrap target/%{name}-impl-%{version}.jar +bnd wrap target/%{name}-impl-%{version}.jar popd %install install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/ install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} -install -m 644 target/%{name}-api-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar +install -m 644 %{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api # pom file @@ -129,7 +129,7 @@ install -pm 644 %{name}-api-%{version}.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-% # javadocs cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/%{name}-api/ -install -m 644 %{name}-impl-%{version}/target/%{name}-impl-%{version}.bar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl.jar +install -m 644 %{name}-impl-%{version}/%{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl.jar ln -sf %{_javadir}/%{name}-impl.jar ${RPM_BUILD_ROOT}%{_javadir}/%{name}.jar # pom file @@ -150,6 +150,9 @@ cp -pr %{name}-impl-%{version}/dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{n %{_javadocdir}/%{name} %changelog +* Thu Jul 16 2015 Michael Simacek - 0:4.3-14 +- Build against aqute-bnd-2.4.1 + * Tue Jul 14 2015 Mikolaj Izdebski - 0:4.3-13 - Add build-requires on javapackages-local