From a2d703e772b6a9519648e130c934dadc675bdc6d Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Aug 24 2007 21:09:06 +0000 Subject: rm eclipse-pydev-noretroweaver.patch --- diff --git a/eclipse-pydev-noretroweaver.patch b/eclipse-pydev-noretroweaver.patch deleted file mode 100644 index 3e67203..0000000 --- a/eclipse-pydev-noretroweaver.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -ru plugins/org.python.pydev/build.properties plugins/org.python.pydev/build.properties ---- plugins/org.python.pydev/build.properties 2006-10-29 14:50:58.000000000 -0500 -+++ plugins/org.python.pydev/build.properties 2007-03-25 16:09:44.000000000 -0400 -@@ -9,7 +9,6 @@ - eclipse32.gif,\ - pydev.gif,\ - Pydev.gif,\ -- retroweaver-rt.jar,\ - shiftone-cache.jar,\ - build.properties - jars.compile.order = pydev.jar -diff -ru plugins/org.python.pydev/META-INF/MANIFEST.MF plugins/org.python.pydev/META-INF/MANIFEST.MF ---- plugins/org.python.pydev/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev/META-INF/MANIFEST.MF 2007-03-25 16:09:57.000000000 -0400 -@@ -3,8 +3,7 @@ - Bundle-Name: Pydev - Python Development Environment - Bundle-SymbolicName: org.python.pydev; singleton:=true - Bundle-Version: 0.9.7.1 --Bundle-ClassPath: pydev.jar, -- retroweaver-rt.jar -+Bundle-ClassPath: pydev.jar - Bundle-Activator: org.python.pydev.plugin.PydevPlugin - Bundle-Vendor: Fabio Zadrozny / Aleks Totic - Bundle-Localization: plugin -diff -ru plugins/org.python.pydev.ast/build.properties plugins/org.python.pydev.ast/build.properties ---- plugins/org.python.pydev.ast/build.properties 2005-09-03 11:59:14.000000000 -0400 -+++ plugins/org.python.pydev.ast/build.properties 2007-03-25 16:09:17.000000000 -0400 -@@ -1,7 +1,6 @@ - bin.includes = plugin.xml,\ - ast.jar,\ -- META-INF/,\ -- retroweaver-rt.jar -+ META-INF/ - jars.compile.order = ast.jar - source.ast.jar = src/ - output.ast.jar = bin/ -diff -ru plugins/org.python.pydev.ast/META-INF/MANIFEST.MF plugins/org.python.pydev.ast/META-INF/MANIFEST.MF ---- plugins/org.python.pydev.ast/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev.ast/META-INF/MANIFEST.MF 2007-03-25 16:09:34.000000000 -0400 -@@ -3,8 +3,7 @@ - Bundle-Name: Ast Plug-in - Bundle-SymbolicName: org.python.pydev.ast; singleton:=true - Bundle-Version: 0.9.7.1 --Bundle-ClassPath: ast.jar, -- retroweaver-rt.jar -+Bundle-ClassPath: ast.jar - Bundle-Activator: org.python.pydev.ast.AstPlugin - Bundle-Localization: plugin - Require-Bundle: org.eclipse.ui, -diff -ru plugins/org.python.pydev.core/build.properties plugins/org.python.pydev.core/build.properties ---- plugins/org.python.pydev.core/build.properties 2005-11-17 09:53:44.000000000 -0500 -+++ plugins/org.python.pydev.core/build.properties 2007-03-25 16:10:49.000000000 -0400 -@@ -3,7 +3,6 @@ - bin.includes = plugin.xml,\ - META-INF/,\ - core.jar,\ -- retroweaver-rt.jar,\ - commons-codec.jar - jars.extra.classpath = commons-codec.jar - jars.compile.order = core.jar -diff -ru plugins/org.python.pydev.core/META-INF/MANIFEST.MF plugins/org.python.pydev.core/META-INF/MANIFEST.MF ---- plugins/org.python.pydev.core/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev.core/META-INF/MANIFEST.MF 2007-03-25 16:10:58.000000000 -0400 -@@ -4,7 +4,6 @@ - Bundle-SymbolicName: org.python.pydev.core; singleton:=true - Bundle-Version: 0.9.7.1 - Bundle-ClassPath: core.jar, -- retroweaver-rt.jar, - commons-codec.jar - Bundle-Activator: org.python.pydev.core.CorePlugin - Bundle-Vendor: Fabio Zadrozny -diff -ru plugins/org.python.pydev.debug/build.properties plugins/org.python.pydev.debug/build.properties ---- plugins/org.python.pydev.debug/build.properties 2005-09-03 11:59:30.000000000 -0400 -+++ plugins/org.python.pydev.debug/build.properties 2007-03-25 16:10:31.000000000 -0400 -@@ -3,8 +3,7 @@ - CVS/,\ - META-INF/,\ - icons/,\ -- pydev-debug.jar,\ -- retroweaver-rt.jar -+ pydev-debug.jar - jars.compile.order = pydev-debug.jar - source.pydev-debug.jar = src/ - output.pydev-debug.jar = bin/ -diff -ru plugins/org.python.pydev.debug/META-INF/MANIFEST.MF plugins/org.python.pydev.debug/META-INF/MANIFEST.MF ---- plugins/org.python.pydev.debug/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev.debug/META-INF/MANIFEST.MF 2007-03-25 16:10:42.000000000 -0400 -@@ -3,8 +3,7 @@ - Bundle-Name: Pydev debug - Bundle-SymbolicName: org.python.pydev.debug; singleton:=true - Bundle-Version: 0.9.7.1 --Bundle-ClassPath: pydev-debug.jar, -- retroweaver-rt.jar -+Bundle-ClassPath: pydev-debug.jar - Bundle-Activator: org.python.pydev.debug.core.PydevDebugPlugin - Bundle-Vendor: Fabio Zadrozny / Aleks Totic - Bundle-Localization: plugin -diff -ru plugins/org.python.pydev.jython/build.properties plugins/org.python.pydev.jython/build.properties ---- plugins/org.python.pydev.jython/build.properties 2006-04-06 12:12:37.000000000 -0400 -+++ plugins/org.python.pydev.jython/build.properties 2007-03-25 16:10:07.000000000 -0400 -@@ -2,7 +2,6 @@ - pydev-jython.jar,\ - jython.jar,\ - jysrc/,\ -- retroweaver-rt.jar,\ - plugin.xml,\ - Lib/ - jars.compile.order = pydev-jython.jar -diff -ru plugins/org.python.pydev.jython/META-INF/MANIFEST.MF plugins/org.python.pydev.jython/META-INF/MANIFEST.MF ---- plugins/org.python.pydev.jython/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev.jython/META-INF/MANIFEST.MF 2007-03-25 16:10:16.000000000 -0400 -@@ -4,7 +4,6 @@ - Bundle-SymbolicName: org.python.pydev.jython; singleton:=true - Bundle-Version: 0.9.7.1 - Bundle-ClassPath: pydev-jython.jar, -- retroweaver-rt.jar, - jython.jar - Bundle-Activator: org.python.pydev.jython.JythonPlugin - Bundle-Vendor: Fabio Zadrozny -diff -ru plugins/org.python.pydev.parser/build.properties plugins/org.python.pydev.parser/build.properties ---- plugins/org.python.pydev.parser/build.properties 2005-09-03 11:59:02.000000000 -0400 -+++ plugins/org.python.pydev.parser/build.properties 2007-03-25 16:11:10.000000000 -0400 -@@ -2,5 +2,4 @@ - output.parser.jar = bin/ - bin.includes = plugin.xml,\ - META-INF/,\ -- parser.jar,\ -- retroweaver-rt.jar -+ parser.jar -diff -ru plugins/org.python.pydev.parser/META-INF/MANIFEST.MF plugins/org.python.pydev.parser/META-INF/MANIFEST.MF ---- plugins/org.python.pydev.parser/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev.parser/META-INF/MANIFEST.MF 2007-03-25 16:11:27.000000000 -0400 -@@ -3,8 +3,7 @@ - Bundle-Name: Parser Plug-in - Bundle-SymbolicName: org.python.pydev.parser; singleton:=true - Bundle-Version: 0.9.7.1 --Bundle-ClassPath: parser.jar, -- retroweaver-rt.jar -+Bundle-ClassPath: parser.jar - Bundle-Activator: org.python.pydev.parser.ParserPlugin - Bundle-Localization: plugin - Require-Bundle: org.junit, -diff -ru plugins/org.python.pydev.templates/build.properties plugins/org.python.pydev.templates/build.properties ---- plugins/org.python.pydev.templates/build.properties 2005-09-03 14:00:51.000000000 -0400 -+++ plugins/org.python.pydev.templates/build.properties 2007-03-25 16:11:34.000000000 -0400 -@@ -1,5 +1,4 @@ - bin.includes = META-INF/,\ - plugin.xml,\ -- icons/,\ -- retroweaver-rt.jar -+ icons/ - jars.compile.order = -diff -ru plugins/org.python.pydev.templates/META-INF/MANIFEST.MF plugins/org.python.pydev.templates/META-INF/MANIFEST.MF ---- plugins/org.python.pydev.templates/META-INF/MANIFEST.MF 2007-03-25 16:12:17.000000000 -0400 -+++ plugins/org.python.pydev.templates/META-INF/MANIFEST.MF 2007-03-25 16:11:42.000000000 -0400 -@@ -10,4 +10,3 @@ - org.eclipse.core.runtime, - org.python.pydev - Eclipse-AutoStart: true --Bundle-ClassPath: retroweaver-rt.jar diff --git a/eclipse-pydev.spec b/eclipse-pydev.spec index 3e957de..95ef518 100644 --- a/eclipse-pydev.spec +++ b/eclipse-pydev.spec @@ -18,8 +18,6 @@ URL: http://pydev.sourceforge.net/ Group: Development/Tools Source0: http://downloads.sourceforge.net/pydev/org.python.pydev.feature-src-1_3_8.zip -# Remove references to the retroweaver jar, since we don't use it -Patch1: %{name}-noretroweaver.patch %if %{gcj_support} BuildRequires: gcc-java >= 4.1.2