rpms/eclipse/devel eclipse-pdebuild.sh, 1.5, 1.6 eclipse.spec, 1.580, 1.581

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4162

Modified Files:
	eclipse-pdebuild.sh eclipse.spec 
Log Message:
- Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov)


Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-pdebuild.sh	6 Aug 2008 22:00:40 -0000	1.5
+++ eclipse-pdebuild.sh	12 Aug 2008 18:53:33 -0000	1.6
@@ -103,7 +103,7 @@
 SDK=$buildDir/SDK
 homeDir=$buildDir/home
 datadir=`rpm --eval "%{_libdir}"`
-pdeBuildDir=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
+pdeBuildDir=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@
 
 featureId=
 dependencies=
@@ -212,7 +212,7 @@
 -DbaseLocation=$SDK \
 -DsourceDirectory=$sourceDir \
 -DbuildDirectory=$buildDir \
--Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
 -DorbitDepsDir="$orbitDepsDir" \
 -Dp2.root.name="$featureName" \
 -Dp2.root.version="$featureVersion" \
@@ -238,7 +238,7 @@
     -DbaseLocation=$SDK \
     -DsourceDirectory=$sourceDir \
     -DbuildDirectory=$buildDir \
-    -Dbuilder=$datadir/eclipse/dropins/sdk/eclipse/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
+    -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at PDEBUILDVERSION@/templates/package-build \
     -DorbitDepsDir=$orbitDepsDir \
     -Dp2.root.name="$featureName" \
     -Dp2.root.version="$featureVersion" \


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.580
retrieving revision 1.581
diff -u -r1.580 -r1.581
--- eclipse.spec	12 Aug 2008 15:26:24 -0000	1.580
+++ eclipse.spec	12 Aug 2008 18:53:34 -0000	1.581
@@ -1460,6 +1460,7 @@
 %changelog
 * Tue Aug 12 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-20
 - Require release of jetty which requires tomcat bits with proper metadata
+- Fix pdebuild for moved JDT and PDE plugins (Alexander Kurtakov)
 
 * Mon Aug 11 2008 Andrew Overholt <overholt at redhat.com> 3.4.0-19
 - Move jdt and sdk dropins contents to non-eclipse-sub-dir place which