rpms/eclipse/devel eclipse-pdebuild.sh, 1.12, 1.13 eclipse.spec, 1.623, 1.624
Alexander Kurtakov
akurtakov at fedoraproject.org
Fri Mar 20 18:39:51 UTC 2009
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4139/devel
Modified Files:
eclipse-pdebuild.sh eclipse.spec
Log Message:
- Disable XULRunner-specific patch.
- Make pdebuild script to not generate p2 repo.
Index: eclipse-pdebuild.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-pdebuild.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- eclipse-pdebuild.sh 19 Jan 2009 15:26:25 -0000 1.12
+++ eclipse-pdebuild.sh 20 Mar 2009 18:39:20 -0000 1.13
@@ -276,27 +276,12 @@
-Dbuilder=$datadir/eclipse/dropins/sdk/plugins/org.eclipse.pde.build_ at 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 \
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -r1.623 -r1.624
--- eclipse.spec 16 Mar 2009 18:14:14 -0000 1.623
+++ eclipse.spec 20 Mar 2009 18:39:20 -0000 1.624
@@ -29,7 +29,7 @@
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 @@
#%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 @@
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Fri Mar 20 2009 Alexander Kurtakov <akurtako at 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 at redhat.com> 1:3.4.2-4
- Build with XULRunner-specific flags since we're building against XULRunner.
More information about the scm-commits
mailing list