From fdb692532550f57bb08eba29a774e0a017cb4e3e Mon Sep 17 00:00:00 2001
From: rmyers <rmyers@fedoraproject.org>
Date: Sep 28 2008 17:32:58 +0000
Subject: Move files and update build for Eclipse SDK 3.4 (patch from overholt,

    thanks)

---

diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index d381aeb..5131c09 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -4,7 +4,7 @@
 Summary:          Eclipse Git plug-in
 Name:             eclipse-egit
 Version:          0.3.1
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          EPL and GPLv2 and LGPLv2
 URL:              http://repo.or.cz/w/egit.git
 Group:            Development/Tools
@@ -40,35 +40,16 @@ interacting with Git repositories.
 %setup -q -c 
 
 %build
-# Copy the SDK for build
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
-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 egit feature
-java -cp $SDK/startup.jar                              \
-     -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration  \
-     org.eclipse.core.launcher.Main                    \
-     -application org.eclipse.ant.core.antRunner       \
-     -Dtype=feature                                    \
-     -Did=org.spearce.egit                             \
-     -DbaseLocation=$SDK                               \
-     -DjavacSource=1.5  -DjavacTarget=1.5              \
-     -DsourceDirectory=$(pwd)                          \
-     -DbuildDirectory=$(pwd)/build                     \
-     -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
-     -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
-     -vmargs -Duser.home=$homedir
+%{_libdir}/eclipse/buildscripts/pdebuild \
+   -a "-DjavacSource=1.5 -DjavacTarget=1.5"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse
+installDir=$RPM_BUILD_ROOT/%{_datadir}/eclipse/dropins/egit
+install -d -m755 $installDir
 
 # egit main feature
-unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
+unzip -q -d $installDir/ \
             build/rpmBuild/org.spearce.egit.zip
 
 %if %{gcj_support}
@@ -85,16 +66,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/eclipse/features/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit.core*
-%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
-%{_datadir}/eclipse/plugins/org.spearce.jgit*
+%{_datadir}/eclipse/dropins/egit
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt@redhat.com> 0.3.1-2
+- Move files and update build for Eclipse SDK 3.4
+- Use pdebuild
+
 * Thu Jul 17 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.3.1-1
 - fix license tag