rpms/eclipse-phpeclipse/devel eclipse-phpeclipse-httpd-integration.patch, 1.7, 1.8 .cvsignore, 1.4, 1.5 eclipse-phpeclipse-external-preview.patch, 1.2, 1.3 eclipse-phpeclipse-external-parser.patch, 1.2, 1.3 eclipse-phpeclipse-rm-win32-help.patch, 1.3, 1.4 eclipse-phpeclipse-fix-phpmanual-view.patch, 1.1, 1.2 eclipse-phpeclipse-fix-build-props.patch, 1.2, 1.3 sources, 1.5, 1.6 eclipse-phpeclipse-broken-help-links.patch, 1.2, 1.3 eclipse-phpeclipse.spec, 1.13, 1.14 get-phpeclipse.sh, 1.3, NONE
Alexander Kurtakov
akurtakov at fedoraproject.org
Tue Jan 26 09:24:08 UTC 2010
Author: akurtakov
Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15943/devel
Modified Files:
eclipse-phpeclipse-httpd-integration.patch .cvsignore
eclipse-phpeclipse-external-preview.patch
eclipse-phpeclipse-external-parser.patch
eclipse-phpeclipse-rm-win32-help.patch
eclipse-phpeclipse-fix-phpmanual-view.patch
eclipse-phpeclipse-fix-build-props.patch sources
eclipse-phpeclipse-broken-help-links.patch
eclipse-phpeclipse.spec
Removed Files:
get-phpeclipse.sh
Log Message:
- Update to 1.2.3 release.
- Use upstream tarball.
eclipse-phpeclipse-httpd-integration.patch:
net.sourceforge.phpeclipse.externaltools/build.properties | 6 +
net.sourceforge.phpeclipse.externaltools/conf/httpd.conf | 23 +++++
net.sourceforge.phpeclipse.externaltools/plugin.xml | 27 ------
net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties | 20 ++--
net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java | 19 +++-
net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java | 2
net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java | 19 +++-
net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java | 15 +++
net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java | 42 +++++++++-
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java | 3
10 files changed, 127 insertions(+), 49 deletions(-)
Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- eclipse-phpeclipse-httpd-integration.patch 5 Apr 2009 19:05:35 -0000 1.7
+++ eclipse-phpeclipse-httpd-integration.patch 26 Jan 2010 09:24:07 -0000 1.8
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
+Index: ./plugins/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java (working copy)
@@ -52,6 +52,7 @@
import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider;
import net.sourceforge.phpeclipse.builder.FileStorage;
@@ -19,10 +19,10 @@ Index: /home/mbooth/workspace-plugins/ne
super.stop(context);
}
}
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
+Index: ./plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java (working copy)
@@ -15,16 +15,19 @@
import java.io.IOException;
@@ -97,10 +97,10 @@ Index: /home/mbooth/workspace-plugins/ne
// store.setDefault(PHP_BOOKMARK_DEFAULT, "");
store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "false");
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties (working copy)
@@ -1,13 +1,13 @@
-_php_run_pref=/opt/lamp/php/php
-_external_parser=/opt/lamp/php/php -l -f {0}
@@ -119,16 +119,16 @@ Index: /home/mbooth/workspace-plugins/ne
+_xampp_start_pref=
+_xampp_stop_pref=
+__mysql_start=
-+__apache_start=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}"
-+__apache_stop=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k stop
-+__apache_restart=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.1/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k restart
++__apache_start=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.3.200910091456PRD/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}"
++__apache_stop=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.3.200910091456PRD/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k stop
++__apache_restart=-f /usr/share/eclipse/dropins/phpeclipse/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.3.200910091456PRD/conf/httpd.conf -c "ErrorLog {0}/.metadata/phpeclipse-httpd-error_log" -c "DocumentRoot {0}" -c "PidFile {0}/.metadata/phpeclipse-httpd.pid" -c "Listen {1}" -k restart
_mysql_start_background=true
_apache_start_background=true
_apache_stop_background=true
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/conf/httpd.conf
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/conf/httpd.conf
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/conf/httpd.conf (revision 0)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/conf/httpd.conf (revision 0)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/conf/httpd.conf (revision 0)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/conf/httpd.conf (revision 0)
@@ -0,0 +1,23 @@
+# minimal httpd conf file for use with PHPEclipse
+StartServers 1
@@ -153,10 +153,10 @@ Index: /home/mbooth/workspace-plugins/ne
+# PHP settings
+LoadModule php5_module modules/libphp5.so
+AddHandler php5-script .php
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java (working copy)
@@ -32,7 +32,7 @@
// replace backslash with slash in the DocumentRoot under Windows
@@ -166,10 +166,10 @@ Index: /home/mbooth/workspace-plugins/ne
MessageFormat form = new MessageFormat(store
.getString(ExternalToolsPlugin.APACHE_START_PREF));
execute("apache_start", store
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java (working copy)
@@ -11,20 +11,31 @@
**********************************************************************/
package net.sourceforge.phpdt.externaltools.actions;
@@ -206,10 +206,10 @@ Index: /home/mbooth/workspace-plugins/ne
.getBoolean(ExternalToolsPlugin.APACHE_RESTART_BACKGROUND));
}
}
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java (working copy)
@@ -11,20 +11,31 @@
**********************************************************************/
package net.sourceforge.phpdt.externaltools.actions;
@@ -246,10 +246,10 @@ Index: /home/mbooth/workspace-plugins/ne
.getBoolean(ExternalToolsPlugin.APACHE_STOP_BACKGROUND));
}
}
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java (working copy)
@@ -15,6 +15,7 @@
import java.util.Enumeration;
import java.util.PropertyResourceBundle;
@@ -285,10 +285,10 @@ Index: /home/mbooth/workspace-plugins/ne
+ }
}
\ No newline at end of file
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/build.properties
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/build.properties
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/build.properties (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/build.properties (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/build.properties (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/build.properties (working copy)
@@ -5,6 +5,7 @@
icons/,\
META-INF/,\
@@ -307,10 +307,10 @@ Index: /home/mbooth/workspace-plugins/ne
+ prefs/default_win32.properties
+src.excludes = prefs/default_macosx.properties,\
+ prefs/default_win32.properties
-Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml
===================================================================
---- /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml (revision 1643)
-+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.externaltools/plugin.xml (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml (revision 1643)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml (working copy)
@@ -192,11 +192,6 @@
</page>
<page
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 15 Nov 2008 02:23:30 -0000 1.4
+++ .cvsignore 26 Jan 2010 09:24:07 -0000 1.5
@@ -1 +1,2 @@
phpeclipse-1.2.1.tar.gz
+PHPEclipse-1.2.3.200910091456PRD-src.zip
eclipse-phpeclipse-external-preview.patch:
ShowExternalPreviewAction.java | 40 ++++++++++++++++++----------------------
1 file changed, 18 insertions(+), 22 deletions(-)
Index: eclipse-phpeclipse-external-preview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-external-preview.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-phpeclipse-external-preview.patch 15 Nov 2008 02:23:30 -0000 1.2
+++ eclipse-phpeclipse-external-preview.patch 26 Jan 2010 09:24:07 -0000 1.3
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
+Index: ./plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java (working copy)
@@ -145,30 +145,26 @@
if (store == null) {
store = WebUI.getDefault().getPreferenceStore();
eclipse-phpeclipse-external-parser.patch:
ExternalPHPParser.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: eclipse-phpeclipse-external-parser.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-external-parser.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-phpeclipse-external-parser.patch 15 Nov 2008 02:23:30 -0000 1.2
+++ eclipse-phpeclipse-external-parser.patch 26 Jan 2010 09:24:07 -0000 1.3
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
+Index: ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java (working copy)
@@ -50,11 +50,9 @@
* the file that will be parsed
*/
eclipse-phpeclipse-rm-win32-help.patch:
plugin.xml | 6 ------
1 file changed, 6 deletions(-)
Index: eclipse-phpeclipse-rm-win32-help.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-rm-win32-help.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-phpeclipse-rm-win32-help.patch 15 Nov 2008 02:23:30 -0000 1.3
+++ eclipse-phpeclipse-rm-win32-help.patch 26 Jan 2010 09:24:07 -0000 1.4
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phphelp/plugin.xml
+Index: ./plugins/net.sourceforge.phpeclipse.phphelp/plugin.xml
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phphelp/plugin.xml (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phphelp/plugin.xml (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.phphelp/plugin.xml (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.phphelp/plugin.xml (working copy)
@@ -65,12 +65,6 @@
<extension
point="org.eclipse.ui.preferencePages">
eclipse-phpeclipse-fix-phpmanual-view.patch:
plugin.xml | 6 +++---
src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
Index: eclipse-phpeclipse-fix-phpmanual-view.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-fix-phpmanual-view.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-phpeclipse-fix-phpmanual-view.patch 5 Apr 2009 19:05:35 -0000 1.1
+++ eclipse-phpeclipse-fix-phpmanual-view.patch 26 Jan 2010 09:24:07 -0000 1.2
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
+Index: ./plugins/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
===================================================================
---- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java (revision 1643)
-+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java (revision 1643)
++++ ./plugins/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java (working copy)
@@ -181,7 +181,8 @@
Display.getDefault().asyncExec(new Runnable() {
public void run() {
@@ -12,10 +12,10 @@ Index: /home/mbooth/workspace/net.source
}
});
}
-Index: /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml
+Index: ./plugins/net.sourceforge.phpeclipse.phpmanual/plugin.xml
===================================================================
---- /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml (revision 1643)
-+++ /home/mbooth/workspace/net.sourceforge.phpeclipse.phpmanual/plugin.xml (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.phpmanual/plugin.xml (revision 1643)
++++ ./plugins/net.sourceforge.phpeclipse.phpmanual/plugin.xml (working copy)
@@ -13,16 +13,16 @@
icon="icons/phpmanual.png"
category="net.sourceforge.phpeclipse.views.category"
eclipse-phpeclipse-fix-build-props.patch:
build.properties | 1 -
1 file changed, 1 deletion(-)
Index: eclipse-phpeclipse-fix-build-props.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-fix-build-props.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-phpeclipse-fix-build-props.patch 15 Nov 2008 02:23:30 -0000 1.2
+++ eclipse-phpeclipse-fix-build-props.patch 26 Jan 2010 09:24:07 -0000 1.3
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/build.properties
+Index: ./plugins/net.sourceforge.phpeclipse.ui/build.properties
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/build.properties (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/build.properties (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.ui/build.properties (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.ui/build.properties (working copy)
@@ -4,7 +4,6 @@
plugin.properties,\
templates/,\
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources 5 Apr 2009 19:05:35 -0000 1.5
+++ sources 26 Jan 2010 09:24:07 -0000 1.6
@@ -1 +1 @@
-8ac385ed7418b7cf61cacc7f630adf36 phpeclipse-1.2.1.tar.gz
+1723adc0853434e5c87ea0b5729302aa PHPEclipse-1.2.3.200910091456PRD-src.zip
eclipse-phpeclipse-broken-help-links.patch:
phphelp.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Index: eclipse-phpeclipse-broken-help-links.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-broken-help-links.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- eclipse-phpeclipse-broken-help-links.patch 15 Nov 2008 02:23:30 -0000 1.2
+++ eclipse-phpeclipse-broken-help-links.patch 26 Jan 2010 09:24:07 -0000 1.3
@@ -1,7 +1,7 @@
-Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phphelp/phphelp.xml
+Index: ./plugins/net.sourceforge.phpeclipse.phphelp/phphelp.xml
===================================================================
---- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phphelp/phphelp.xml (revision 1625)
-+++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phphelp/phphelp.xml (working copy)
+--- ./plugins/net.sourceforge.phpeclipse.phphelp/phphelp.xml (revision 1625)
++++ ./plugins/net.sourceforge.phpeclipse.phphelp/phphelp.xml (working copy)
@@ -1,4 +1,4 @@
-<toc label="PHPEclipse Help" topic="doc/phpeclipse/index.html">
+<toc label="PHPEclipse Help" topic="doc/index.html">
Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- eclipse-phpeclipse.spec 24 Jul 2009 20:56:21 -0000 1.13
+++ eclipse-phpeclipse.spec 26 Jan 2010 09:24:07 -0000 1.14
@@ -2,18 +2,14 @@
%define eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-phpeclipse
-Version: 1.2.1
-Release: 5%{?dist}
+Version: 1.2.3
+Release: 1%{?dist}
Summary: PHP Eclipse plugin
Group: Development/Tools
License: CPL
URL: http://phpeclipse.net/
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-phpeclipse.sh
-Source0: phpeclipse-%{version}.tar.gz
-Source1: get-phpeclipse.sh
+Source0: http://downloads.sourceforge.net/project/phpeclipse/a%29%20Eclipse%203.3.x/PHPEclipse-1.2.3/PHPEclipse-1.2.3.200910091456PRD-src.zip
Patch0: %{name}-broken-help-links.patch
Patch1: %{name}-fix-build-props.patch
@@ -45,41 +41,29 @@ supported include syntax highlighting, c
templates and support for the XDebug and DBG debuggers.
%prep
-%setup -q -n phpeclipse-%{version}
+%setup -q -c
# apply patches
-%patch0 -p4
-%patch1 -p4
-%patch2 -p4
-%patch4 -p4
-%patch5 -p4
-%patch6 -p4
-%patch7 -p4
+%patch0
+%patch1
+%patch2
+%patch4
+%patch5
+%patch6
+%patch7
+
+#remove bundled jars
+find -name '*.class' -exec rm -f '{}' \;
+find -name '*.jar' -exec rm -f '{}' \;
# ditch bundled libs in favor of building against fedora packaged libs
-rm net.sourceforge.phpeclipse.phpmanual.htmlparser/sax2.jar \
- net.sourceforge.phpeclipse.phpmanual.htmlparser/htmllexer.jar \
- net.sourceforge.phpeclipse.phpmanual.htmlparser/filterbuilder.jar \
- net.sourceforge.phpeclipse.phpmanual.htmlparser/thumbelina.jar \
- net.sourceforge.phpeclipse.phpmanual.htmlparser/junit.jar \
- net.sourceforge.phpeclipse.phpmanual.htmlparser/htmlparser.jar
+pushd plugins
build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser htmlparser
+popd
# fix jar versions
find -name MANIFEST.MF | xargs sed --in-place "s/0.0.0/%{version}/"
-# make sure upstream hasn't sneaked in any jars we don't know about
-JARS=""
-for j in `find -name "*.jar"`; do
- if [ ! -L $j ]; then
- JARS="$JARS $j"
- fi
-done
-if [ ! -z "$JARS" ]; then
- echo "These jars should be deleted and symlinked to system jars: $JARS"
- exit 1
-fi
-
%build
# build the main feature
%{eclipse_base}/buildscripts/pdebuild -f net.sourceforge.phpeclipse.feature
@@ -107,12 +91,16 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc net.sourceforge.phpeclipse.feature/cpl-v10.html
+%doc features/net.sourceforge.phpeclipse.feature/cpl-v10.html
%{eclipse_dropin}/phpeclipse
%{eclipse_dropin}/phpeclipse-debug
%{eclipse_dropin}/phpeclipse-xdebug
%changelog
+* Tue Jan 26 2010 Alexander Kurtakov <akurtako at redhat.com> 1.2.3-1
+- Update to 1.2.3 release.
+- Use upstream tarball.
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
--- get-phpeclipse.sh DELETED ---
More information about the scm-commits
mailing list