From 6f3d1c848135a7ee625c3656b331dd558f530d86 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtakov@fedoraproject.org>
Date: Mar 20 2009 18:39:20 +0000
Subject: - Disable XULRunner-specific patch.

- Make pdebuild script to not generate p2 repo.

---

diff --git a/eclipse-pdebuild.sh b/eclipse-pdebuild.sh
index 56fa465..79462bc 100755
--- a/eclipse-pdebuild.sh
+++ b/eclipse-pdebuild.sh
@@ -276,27 +276,12 @@ if [ $testing != true ]; then
     -Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_@PDEBUILDVERSION@/templates/package-build \
     $orbitDeps \
     -Dtesting="$testing" \
-    -Dp2.root.name="$featureName" \
-    -Dp2.root.version="$featureVersion" \
-    -Dgenerate.p2.metadata=true \
-    -Dp2.metadata.repo=file:$buildDir/repo \
-    -Dp2.artifact.repo=file:$buildDir/repo \
-    -Dp2.flavor=tooling \
-    -Dp2.publish.artifacts=true \
     $additionalArgs \
     -f $pdeBuildDir/scripts/build.xml \
     -vmargs \
     -Duser.home=$homeDir \
     $vmArgs
 
-  # Add content.xml into zip
-  pushd $buildDir/rpmBuild
-  unzip $featureId.zip
-  rm $featureId.zip
-  cp -p ../repo/content.xml eclipse
-  zip -r $featureId.zip eclipse
-  rm -rf eclipse
-  popd
 else
   java -cp $SDK/startup.jar \
     org.eclipse.core.launcher.Main \
diff --git a/eclipse.spec b/eclipse.spec
index 5d45841..c637121 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -29,7 +29,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -352,9 +352,9 @@ popd
 #%patch40
 #popd
 
-pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
-%patch45 -p3
-popd
+#pushd "plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library"
+#%patch45 -p3
+#popd
 
 # Remove signatures for JARs
 find -iname \*.sf | xargs rm
@@ -1481,6 +1481,10 @@ fi
 #%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
 
 %changelog
+* Fri Mar 20 2009 Alexander Kurtakov <akurtako@redhat.com> 1:3.4.2-5
+- Disable XULRunner-specific patch.
+- Make pdebuild script to not generate p2 repo. 
+
 * Mon Mar 16 2009 Andrew Overholt <overholt@redhat.com> 1:3.4.2-4
 - Build with XULRunner-specific flags since we're building against XULRunner.