Author: glen Date: Fri Oct 21 21:58:09 2011 GMT Module: packages Tag: HEAD ---- Log message: - builds now
---- Files affected: packages/java-libbase: java-libbase.spec (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/java-libbase/java-libbase.spec diff -u packages/java-libbase/java-libbase.spec:1.2 packages/java-libbase/java-libbase.spec:1.3 --- packages/java-libbase/java-libbase.spec:1.2 Fri Oct 21 21:13:54 2011 +++ packages/java-libbase/java-libbase.spec Fri Oct 21 23:58:04 2011 @@ -1,6 +1,4 @@ # $Revision$, $Date$ -# TODO -# - ant contrib dep # # Conditional build: %bcond_without javadoc # don't build javadoc @@ -18,11 +16,12 @@ Patch0: build.patch URL: http://reporting.pentaho.org/ BuildRequires: ant -#BuildRequires: ant-contrib +BuildRequires: ant-contrib BuildRequires: ant-nodeps BuildRequires: java-commons-logging BuildRequires: jdk BuildRequires: jpackage-utils +BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.553 Requires: java-commons-logging Requires: jpackage-utils @@ -48,15 +47,15 @@ %undos build.properties %patch0 -p1 +find -name "*.jar" | xargs rm -v + mkdir -p lib ln -s %{_javadir}/ant lib/ant-contrib -find -name "*.jar" | xargs rm -v - %build build-jar-repository -s -p lib commons-logging-api -%ant jar javadoc +%ant jar %{?with_javadoc:javadoc} %install rm -rf $RPM_BUILD_ROOT @@ -65,8 +64,11 @@ cp -p dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir} ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} -cp -a bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} +%if %{with javadoc} +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +cp -a bin/javadoc/docs/api $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -77,8 +79,8 @@ %files %defattr(644,root,root,755) %doc ChangeLog.txt licence-LGPL.txt README.txt -%{_javadir}/%{name}-%{version}.jar -%{_javadir}/%{name}.jar +%{_javadir}/%{srcname}-%{version}.jar +%{_javadir}/%{srcname}.jar %if %{with javadoc} %files javadoc @@ -93,6 +95,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2011/10/21 21:58:04 glen +- builds now + Revision 1.2 2011/10/21 19:13:54 glen - dos file fix ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-libbase/java-libbase.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
