Index: eclipse-mylyn.spec =================================================================== RCS file: /cvs/pkgs/rpms/eclipse-mylyn/devel/eclipse-mylyn.spec,v retrieving revision 1.14 diff -u -r1.14 eclipse-mylyn.spec --- eclipse-mylyn.spec 19 Feb 2008 17:31:43 -0000 1.14 +++ eclipse-mylyn.spec 27 Mar 2008 20:14:59 -0000 @@ -144,9 +144,6 @@ %patch4 popd -/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base} -mkdir home - # symlink out to jars we built pushd org.eclipse.mylyn.web.core/lib-httpclient rm commons-*.jar @@ -177,130 +174,27 @@ %{__grep} mylar org.eclipse.mylyn-feature/feature.xml && exit 1 %build -SDK=$(cd SDK > /dev/null && pwd) - -# Eclipse may try to write to the home directory. -homedir=$(cd home > /dev/null && pwd) - -# build the main mylyn feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn bugzilla feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.bugzilla_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn context feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.context_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn ide feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.ide_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn trac feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.trac_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn java feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.java_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - -# build the mylyn pde feature -java -cp $SDK/startup.jar \ - -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \ - org.eclipse.core.launcher.Main \ - -application org.eclipse.ant.core.antRunner \ - -DjavacSource=1.5 \ - -DjavacTarget=1.5 \ - -Dtype=feature \ - -Did=org.eclipse.mylyn.pde_feature \ - -DbaseLocation=$SDK \ - -DsourceDirectory=$(pwd) \ - -DbuildDirectory=$(pwd)/build \ - -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build \ - -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml \ - -vmargs -Duser.home=$homedir \ - -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar - +pdebuild -f org.eclipse.mylyn_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar +pdebuild -f org.eclipse.mylyn.bugzilla_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar +pdebuild -f org.eclipse.mylyn.context_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar +pdebuild -f org.eclipse.mylyn.ide_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar +pdebuild -f org.eclipse.mylyn.trac_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar +pdebuild -f org.eclipse.mylyn.java_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar +pdebuild -f org.eclipse.mylyn.pde_feature \ + -a "-DjavacSource=1.5 -DjavacTarget=1.5" \ + -j -DJ2SE-1.5=%{_jvmdir}/java/jre/lib/rt.jar %install rm -rf %{buildroot}