rpms/sat4j/devel sat4j.spec,1.5,1.6

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/sat4j/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18077

Modified Files:
	sat4j.spec 
Log Message:
PDE Build location


Index: sat4j.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sat4j/devel/sat4j.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sat4j.spec	28 Aug 2008 18:45:33 -0000	1.5
+++ sat4j.spec	28 Aug 2008 19:46:00 -0000	1.6
@@ -40,6 +40,8 @@
 %prep
 %setup -q -c -a 1
 /bin/sh %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
+# Remove existing sat4j plugins so we build against this source
+rm SDK/plugins/org.sat4j*
 
 pushd core
 # Only used for the tests
@@ -80,6 +82,8 @@
 echo "<project default=\"main\"><target name=\"main\"></target></project>" \
  > build/package.org.sat4j.core.all.xml
 
+pdeBuildVersion=$(ls $SDK/plugins | \
+  grep org.eclipse.pde.build_ | sed 's/org.eclipse.pde.build_//')
 java -cp $SDK/startup.jar \
  -Duser.home=$home \
  -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
@@ -92,8 +96,8 @@
  -DbaseLocation=$SDK \
  -DsourceDirectory=$(pwd) \
  -DbuildDirectory=$(pwd)/build \
- -Dbuilder=$SDK/plugins/org.eclipse.pde.build/templates/package-build \
- -f $SDK/plugins/org.eclipse.pde.build/scripts/build.xml
+ -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/templates/package-build \
+ -f $SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/scripts/build.xml
 
 pushd build/plugins/org.sat4j.core/
 java -cp $SDK/startup.jar \
@@ -139,8 +143,8 @@
  -DbaseLocation=$SDK \
  -DsourceDirectory=$(pwd) \
  -DbuildDirectory=$(pwd)/build \
- -Dbuilder=$SDK/plugins/org.eclipse.pde.build/templates/package-build \
- -f $SDK/plugins/org.eclipse.pde.build/scripts/build.xml
+ -Dbuilder=$SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/templates/package-build \
+ -f $SDK/plugins/org.eclipse.pde.build_$pdeBuildVersion/scripts/build.xml
 
 pushd build/plugins/org.sat4j.pb
 java -cp $SDK/startup.jar \