rpms/eclipse-subclipse/F-9 eclipse-subclipse.spec,1.20,1.21

[Robert Marcano (robmv)]

Author: robmv

Update of /cvs/extras/rpms/eclipse-subclipse/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28561

Modified Files:
	eclipse-subclipse.spec 
Log Message:
- Fix Bug 449533: FTBFS eclipse-subclipse-1.2.4-9.fc9
- Changed to use pdebuild script



Index: eclipse-subclipse.spec
===================================================================
RCS file: /cvs/extras/rpms/eclipse-subclipse/F-9/eclipse-subclipse.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- eclipse-subclipse.spec	7 Apr 2008 13:50:59 -0000	1.20
+++ eclipse-subclipse.spec	7 Jul 2008 13:56:33 -0000	1.21
@@ -20,7 +20,7 @@
 
 Name:           eclipse-subclipse
 Version:        1.2.4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Subversion Eclipse plugin
 
 Group:          Text Editors/Integrated Development Environments (IDE)
@@ -116,60 +116,9 @@
 # ---------------------------------
 # building subclipse
 pushd subclipse
-# See comments in the script to understand this.
-# RHEL eclipse has a different instalation root
-%if 0%{?rhel} == 5
-/bin/sh -x %{_libdir}/%{eclipse_name}/buildscripts/copy-platform SDK %{eclipse_base}
-%else
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-%endif
-SDK=$(cd SDK > /dev/null && pwd)
 
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main subclipse feature
-eclipse \
-     -application org.eclipse.ant.core.antRunner       \
-     -Duser.home=$homedir                              \
-     -Dtype=feature                                    \
-     -Did=org.tigris.subversion.subclipse              \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK                               \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-#java -cp %{eclipse_base}/startup.jar                   \
-#     -Duser.home=$homedir                              \
-#     org.eclipse.core.launcher.Main                    \
-#     -application org.eclipse.ant.core.antRunner       \
-#     -Dtype=feature                                    \
-#     -Did=org.tigris.subversion.subclipse              \
-#     -DsourceDirectory=$(pwd)                          \
-#     -DbaseLocation=$SDK                               \
-#     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-#     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-
-# build the subclipse book feature
-eclipse \
-     -application org.eclipse.ant.core.antRunner       \
-     -Duser.home=$homedir                              \
-     -Dtype=feature                                    \
-     -Did=org.tigris.subversion.book                   \
-     -DsourceDirectory=$(pwd)                          \
-     -DbaseLocation=$SDK                               \
-     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
-#java -cp %{eclipse_base}/startup.jar                   \
-#     -Duser.home=$homedir                              \
-#     org.eclipse.core.launcher.Main                    \
-#     -application org.eclipse.ant.core.antRunner       \
-#     -Dtype=feature                                    \
-#     -Did=org.tigris.subversion.book                   \
-#     -DsourceDirectory=$(pwd)                          \
-#     -DbaseLocation=$SDK                               \
-#     -Dbuilder=%{eclipse_base}/plugins/org.eclipse.pde.build/templates/package-build  \
-#     -f %{eclipse_base}/plugins/org.eclipse.pde.build/scripts/build.xml
+%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.subclipse
+%{eclipse_base}/buildscripts/pdebuild -f org.tigris.subversion.book
 
 # returning to base build directory
 popd
@@ -241,6 +190,10 @@
 %{eclipse_base}/plugins/org.tigris.subversion.book_*
 
 %changelog
+* Mon Jul 07 2008 Robert Marcano <robert at marcanoonline.com> 1.2.4-11
+- Fix Bug 449533: FTBFS eclipse-subclipse-1.2.4-9.fc9
+- Changed to use pdebuild script
+
 * Fri Apr 04 2008 Robert Marcano <robert at marcanoonline.com> 1.2.4-9
 - Fix Bug 440818: changed links to svn-javahl.jar