Author: pawelz Date: Mon Mar 30 12:17:44 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - fixed %%build and %%install - BR: ant-trax - EA: (archs supported by java-sun)
---- Files affected: SPECS: java-xstream.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/java-xstream.spec diff -u SPECS/java-xstream.spec:1.1 SPECS/java-xstream.spec:1.2 --- SPECS/java-xstream.spec:1.1 Mon Mar 30 13:49:09 2009 +++ SPECS/java-xstream.spec Mon Mar 30 14:17:38 2009 @@ -2,7 +2,6 @@ # # Conditional build: %bcond_without javadoc # don't build javadoc -%bcond_with tests # run tests (takes long time) %include /usr/lib/rpm/macros.java @@ -17,14 +16,16 @@ # Source0-md5: 3a129d9bdf88e385424a917c59e284e2 URL: http://xstream.codehaus.org/ BuildRequires: ant -%{?with_tests:BuildRequires: ant-junit >= 1.5} +BuildRequires: ant-junit +BuildRequires: ant-trax BuildRequires: java-sun BuildRequires: jpackage-utils -%{?with_tests:BuildRequires: junit >= 3.8.1} +BuildRequires: junit BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jpackage-utils BuildArch: noarch +ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -51,19 +52,19 @@ %build cd xstream -%ant jar %{?with_javadoc:javadoc} +%ant all %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -cp -a target/commons-io-%{version}.jar $RPM_BUILD_ROOT%{_javadir} -ln -sf commons-io-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-io.jar +cp -a xstream/target/xstream-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar +ln -sf %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar # javadoc %if %{with javadoc} install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} -cp -a target/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +cp -a xstream/target/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink %endif @@ -90,6 +91,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2009/03/30 12:17:38 pawelz +- fixed %%build and %%install +- BR: ant-trax +- EA: (archs supported by java-sun) + Revision 1.1 2009/03/30 11:49:09 pawelz - initial - requires sun.reflect.ReflectionFactory, so won't build nor work on gcj )-: ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xstream.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
