rpms/eclipse-phpeclipse/devel .cvsignore, 1.3, 1.4 eclipse-phpeclipse-broken-help-links.patch, 1.1, 1.2 eclipse-phpeclipse-external-parser.patch, 1.1, 1.2 eclipse-phpeclipse-external-preview.patch, 1.1, 1.2 eclipse-phpeclipse-fix-build-props.patch, 1.1, 1.2 eclipse-phpeclipse-httpd-integration.patch, 1.5, 1.6 eclipse-phpeclipse-no-htmlparser.patch, 1.1, 1.2 eclipse-phpeclipse-rm-win32-help.patch, 1.2, 1.3 eclipse-phpeclipse.spec, 1.8, 1.9 get-phpeclipse.sh, 1.1, 1.2 sources, 1.3, 1.4

Mat Booth mbooth at fedoraproject.org
Sat Nov 15 02:24:01 UTC 2008 

Author: mbooth

Update of /cvs/pkgs/rpms/eclipse-phpeclipse/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22247/devel

Modified Files:
	.cvsignore eclipse-phpeclipse-broken-help-links.patch 
	eclipse-phpeclipse-external-parser.patch 
	eclipse-phpeclipse-external-preview.patch 
	eclipse-phpeclipse-fix-build-props.patch 
	eclipse-phpeclipse-httpd-integration.patch 
	eclipse-phpeclipse-no-htmlparser.patch 
	eclipse-phpeclipse-rm-win32-help.patch eclipse-phpeclipse.spec 
	get-phpeclipse.sh sources 
Log Message:
* Fri Nov 14 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.1-1
- Update to 1.2.1 and rebase patches.
- Fixes mark occurances bug in Eclipse 3.4 (#706).
- Fix NPE on shutdown if external tools are not used.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Jun 2008 19:15:15 -0000	1.3
+++ .cvsignore	15 Nov 2008 02:23:30 -0000	1.4
@@ -1 +1 @@
-phpeclipse-1.2.0.tar.gz
+phpeclipse-1.2.1.tar.gz

eclipse-phpeclipse-broken-help-links.patch:

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-phpeclipse-broken-help-links.patch	28 Jun 2008 19:15:15 -0000	1.1
+++ eclipse-phpeclipse-broken-help-links.patch	15 Nov 2008 02:23:30 -0000	1.2
@@ -1,5 +1,7 @@
---- net.sourceforge.phpeclipse.phphelp/phphelp.xml	2006-07-14 11:13:57.000000000 +0100
-+++ net.sourceforge.phpeclipse.phphelp/phphelp.xml	2008-06-22 13:45:54.000000000 +0100
+Index: /home/mbooth/workspace-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)
 @@ -1,4 +1,4 @@
 -<toc label="PHPEclipse Help" topic="doc/phpeclipse/index.html">
 +<toc label="PHPEclipse Help" topic="doc/index.html">

eclipse-phpeclipse-external-parser.patch:

Index: eclipse-phpeclipse-external-parser.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-external-parser.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-phpeclipse-external-parser.patch	29 Jun 2008 18:30:45 -0000	1.1
+++ eclipse-phpeclipse-external-parser.patch	15 Nov 2008 02:23:30 -0000	1.2
@@ -1,7 +1,7 @@
-Index: net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
+Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java
 ===================================================================
---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java	(revision 1573)
-+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/ExternalPHPParser.java	(working copy)
+--- /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)
 @@ -50,11 +50,9 @@
  	 *            the file that will be parsed
  	 */

eclipse-phpeclipse-external-preview.patch:

Index: eclipse-phpeclipse-external-preview.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-external-preview.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-phpeclipse-external-preview.patch	29 Jun 2008 18:30:45 -0000	1.1
+++ eclipse-phpeclipse-external-preview.patch	15 Nov 2008 02:23:30 -0000	1.2
@@ -1,7 +1,7 @@
-Index: net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
+Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
 ===================================================================
---- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java	(revision 1573)
-+++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java	(working copy)
+--- /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)
 @@ -145,30 +145,26 @@
  			if (store == null) {
  				store = WebUI.getDefault().getPreferenceStore();
@@ -20,29 +20,29 @@
 -				localhostURL = localhostURL.substring(documentRoot.length());
 -			} else {
 -				return null;
+-			}
+-			// return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) +
+-			// localhostURL;
+-			String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
 +			IPath path = file.getLocation();
 +			if(path == null)
 +				path = file.getFullPath();
 +			
 +			String filePath = path.toString();
 +			String projectURI = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
-+                    .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
+                     .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
+-			if(projectPath.endsWith("/") && localhostURL.startsWith("/")) {
+-			    localhostURL = localhostURL.substring(1);
 +			String projectDocRoot = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
 +                    .getProject(), IPreferenceConstants.PHP_DOCUMENTROOT_PREF);
 +
 +			if (filePath.startsWith(projectDocRoot)) {
 +				filePath = filePath.substring(projectDocRoot.length());
  			}
--			// return store.getString(PHPeclipsePlugin.LOCALHOST_PREF) +
--			// localhostURL;
--			String projectPath = ProjectPrefUtil.getMiscProjectsPreferenceValue(file
--                    .getProject(), IPreferenceConstants.PHP_LOCALHOST_PREF);
--			if(projectPath.endsWith("/") && localhostURL.startsWith("/")) {
--			    localhostURL = localhostURL.substring(1);
+-			return projectPath + localhostURL;
 +			if(projectURI.endsWith("/") && filePath.startsWith("/")) {
 +				filePath = filePath.substring(1);
- 			}
--			return projectPath + localhostURL;
++			}
 +			
 +			return projectURI + filePath;
  		}

eclipse-phpeclipse-fix-build-props.patch:

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-phpeclipse-fix-build-props.patch	28 Jun 2008 19:15:15 -0000	1.1
+++ eclipse-phpeclipse-fix-build-props.patch	15 Nov 2008 02:23:30 -0000	1.2
@@ -1,5 +1,7 @@
---- net.sourceforge.phpeclipse.ui/build.properties	2006-10-22 00:06:44.000000000 +0100
-+++ net.sourceforge.phpeclipse.ui/build.properties	2008-06-22 11:40:52.000000000 +0100
+Index: /home/mbooth/workspace-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)
 @@ -4,7 +4,6 @@
                 plugin.properties,\
                 templates/,\

eclipse-phpeclipse-httpd-integration.patch:

Index: eclipse-phpeclipse-httpd-integration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-httpd-integration.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-phpeclipse-httpd-integration.patch	14 Sep 2008 23:26:26 -0000	1.5
+++ eclipse-phpeclipse-httpd-integration.patch	15 Nov 2008 02:23:30 -0000	1.6
@@ -1,116 +1,28 @@
---- net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties	2008-09-09 17:59:31.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/prefs/default_linux.properties	2008-09-09 18:01:44.000000000 +0100
-@@ -1,13 +1,13 @@
--_php_run_pref=/opt/lamp/php/php
--_external_parser=/opt/lamp/php/php -l -f {0}
--_mysql_run_pref=/opt/lampp/lampp startmysql
--_apache_run_pref=/opt/lampp/lampp
--_xampp_start_pref=/opt/lampp/lampp start
--_xampp_stop_pref=/opt/lampp/lampp stop
--__mysql_start=startmysql
--__apache_start=startapache -c \"DocumentRoot {0}\"
--__apache_stop=stop
--__apache_restart=restart
-+_php_run_pref=/usr/bin/php
-+_external_parser=/usr/bin/php -l -f {0}
-+_mysql_run_pref=
-+_apache_run_pref=/usr/sbin/httpd
-+_xampp_start_pref=
-+_xampp_stop_pref=
-+__mysql_start=
-+__apache_start=-f /usr/share/eclipse/plugins/net.sourceforge.phpeclipse.externaltools_1.2.0/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/plugins/net.sourceforge.phpeclipse.externaltools_1.2.0/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/plugins/net.sourceforge.phpeclipse.externaltools_1.2.0/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
---- net.sourceforge.phpeclipse.externaltools/conf/httpd.conf	1970-01-01 01:00:00.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/conf/httpd.conf	2008-06-22 13:09:36.000000000 +0100
-@@ -0,0 +1,23 @@
-+# minimal httpd conf file for use with PHPEclipse
-+StartServers 1
-+MinSpareServers 1
-+MaxSpareServers 1
-+MaxClients 3
-+
-+# modules
-+LoadModule mime_module modules/mod_mime.so
-+LoadModule dir_module modules/mod_dir.so
-+LoadModule autoindex_module modules/mod_autoindex.so
-+
-+TypesConfig /etc/mime.types
-+DirectoryIndex index.html index.php default.html default.php
-+DirectorySlash On
-+
-+IndexOptions FoldersFirst VersionSort IgnoreCase NameWidth=* HTMLTable
-+IndexIgnore RECYCLER .??* *~ *# HEADER* README* RCS CVS *,v *,t
-+HeaderName HEADER.html
-+ReadmeName README.html
-+
-+# PHP settings
-+LoadModule php5_module modules/libphp5.so
-+AddHandler php5-script .php
---- net.sourceforge.phpeclipse.externaltools/build.properties	2006-10-22 00:06:44.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/build.properties	2008-06-22 13:15:16.000000000 +0100
-@@ -5,6 +5,7 @@
-                icons/,\
-                META-INF/,\
-                plugin.properties,\
-+               conf/,\
-                prefs/
- src.includes = src/,\
-                build.properties,\
-@@ -15,4 +16,9 @@
-                .cvsignore,\
-                .project,\
-                META-INF/,\
-+               conf/,\
-                prefs/
-+bin.excludes = prefs/default_macosx.properties,\
-+               prefs/default_win32.properties
-+src.excludes = prefs/default_macosx.properties,\
-+               prefs/default_win32.properties
---- net.sourceforge.phpeclipse.externaltools/plugin.xml	2007-09-24 21:26:12.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/plugin.xml	2008-06-15 10:17:07.000000000 +0100
-@@ -192,11 +192,6 @@
- 	  </page>
- 	  <page
- 			category="net.sourceforge.phpdt.externaltools.preferences"
--			class="net.sourceforge.phpdt.externaltools.preferences.XamppPrefencePage"
--			id="net.sourceforge.phpeclipse.externaltools.xampp.preferences"
--			name="XAMPP"/>
--	  <page
--			category="net.sourceforge.phpdt.externaltools.preferences"
- 			class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
- 			id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
- 			name="MySQL"/>
-@@ -268,24 +263,6 @@
- 			   toolbarPath="Normal"
- 			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
- 		 </action>
--		 <action
--			   label="Stop XAMPP"
--			   icon="icons/obj16/xampp_stop.gif"
--			   tooltip="Stop XAMPP"
--			   class="net.sourceforge.phpdt.externaltools.actions.PHPStopXAMPPAction"
--			   menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
--			   toolbarPath="Normal"
--			   id="net.sourceforge.phpdt.externaltools.actions.PHPStopXAMPPAction">
--		 </action>
--		 <action
--			   label="Start XAMPP"
--			   icon="icons/obj16/xampp_start.gif"
--			   tooltip="Start XAMPP"
--			   class="net.sourceforge.phpdt.externaltools.actions.PHPStartXAMPPAction"
--			   menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
--			   toolbarPath="Normal"
--			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartXAMPPAction">
--		 </action>
- 	  </actionSet>
- 	</extension>
+Index: /home/mbooth/workspace-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)
+@@ -52,6 +52,7 @@
+ import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider;
+ import net.sourceforge.phpeclipse.builder.FileStorage;
+ import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
++import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin;
+ import net.sourceforge.phpeclipse.phpeditor.CustomBufferFactory;
+ import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter;
+ import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider;
+@@ -989,6 +990,8 @@
  
---- net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java	2008-01-14 03:40:19.000000000 +0000
-+++ net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/WebUI.java	2008-06-22 20:43:04.000000000 +0100
+ 			// RefactoringCore.getUndoManager().shutdown();
+ 		} finally {
++			if(ExternalToolsPlugin.getDefault() != null) 
++				ExternalToolsPlugin.getDefault().stopHttpd();
+ 			super.stop(context);
+ 		}
+ 	}
+Index: /home/mbooth/workspace-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)
 @@ -15,16 +15,19 @@
  
  import java.io.IOException;
@@ -185,8 +97,66 @@
  		// store.setDefault(PHP_BOOKMARK_DEFAULT, "");
  
  		store.setDefault(PHP_AUTO_PREVIEW_DEFAULT, "false");
---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java	2006-10-22 00:19:54.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStartApacheAction.java	2008-06-22 16:18:08.000000000 +0100
+Index: /home/mbooth/workspace-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)
+@@ -1,13 +1,13 @@
+-_php_run_pref=/opt/lamp/php/php
+-_external_parser=/opt/lamp/php/php -l -f {0}
+-_mysql_run_pref=/opt/lampp/lampp startmysql
+-_apache_run_pref=/opt/lampp/lampp
+-_xampp_start_pref=/opt/lampp/lampp start
+-_xampp_stop_pref=/opt/lampp/lampp stop
+-__mysql_start=startmysql
+-__apache_start=startapache -c \"DocumentRoot {0}\"
+-__apache_stop=stop
+-__apache_restart=restart
++_php_run_pref=/usr/bin/php
++_external_parser=/usr/bin/php -l -f {0}
++_mysql_run_pref=
++_apache_run_pref=/usr/sbin/httpd
++_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
+ _mysql_start_background=true
+ _apache_start_background=true
+ _apache_stop_background=true
+Index: /home/mbooth/workspace-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)
+@@ -0,0 +1,23 @@
++# minimal httpd conf file for use with PHPEclipse
++StartServers 1
++MinSpareServers 1
++MaxSpareServers 1
++MaxClients 3
++
++# modules
++LoadModule mime_module modules/mod_mime.so
++LoadModule dir_module modules/mod_dir.so
++LoadModule autoindex_module modules/mod_autoindex.so
++
++TypesConfig /etc/mime.types
++DirectoryIndex index.html index.php default.html default.php
++DirectorySlash On
++
++IndexOptions FoldersFirst VersionSort IgnoreCase NameWidth=* HTMLTable
++IndexIgnore RECYCLER .??* *~ *# HEADER* README* RCS CVS *,v *,t
++HeaderName HEADER.html
++ReadmeName README.html
++
++# 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
+===================================================================
+--- /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)
 @@ -32,7 +32,7 @@
  
  		// replace backslash with slash in the DocumentRoot under Windows
@@ -196,8 +166,10 @@
  		MessageFormat form = new MessageFormat(store
  				.getString(ExternalToolsPlugin.APACHE_START_PREF));
  		execute("apache_start", store
---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java	2006-10-22 00:19:54.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPStopApacheAction.java	2008-06-22 17:43:22.000000000 +0100
+Index: /home/mbooth/workspace-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)
 @@ -11,20 +11,31 @@
   **********************************************************************/
  package net.sourceforge.phpdt.externaltools.actions;
@@ -210,7 +182,7 @@
  import org.eclipse.jface.action.IAction;
  import org.eclipse.jface.preference.IPreferenceStore;
  
- public class PHPStopApacheAction extends PHPStartApacheAction {
+ public class PHPRestartApacheAction extends PHPStartApacheAction {
  	public void run(IAction action) {
 +		final IPreferenceStore webUIStore = WebUI.getDefault()
 +		.getPreferenceStore();
@@ -218,24 +190,26 @@
 +		String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF);
  		final IPreferenceStore store = ExternalToolsPlugin.getDefault()
  				.getPreferenceStore();
--		// execute(store.getString(PHPeclipsePlugin.APACHE_STOP_PREF), "Stop
--		// Apache: ");
+-		// execute(store.getString(PHPeclipsePlugin.APACHE_RESTART_PREF),
+-		// "Restart Apache: ");
 +
 +		// replace backslash with slash in the DocumentRoot under Windows
 +		documentRoot = documentRoot.replace('\\', '/');
 +		String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() };
 +		MessageFormat form = new MessageFormat(store
-+				.getString(ExternalToolsPlugin.APACHE_STOP_PREF));
- 		execute("apache_stop", store
++				.getString(ExternalToolsPlugin.APACHE_RESTART_PREF));
+ 		execute("apache_restart", store
 -				.getString(ExternalToolsPlugin.APACHE_RUN_PREF), store
--				.getString(ExternalToolsPlugin.APACHE_STOP_PREF), store
+-				.getString(ExternalToolsPlugin.APACHE_RESTART_PREF), store
 +				.getString(ExternalToolsPlugin.APACHE_RUN_PREF), form
 +				.format(arguments), store
- 				.getBoolean(ExternalToolsPlugin.APACHE_STOP_BACKGROUND));
+ 				.getBoolean(ExternalToolsPlugin.APACHE_RESTART_BACKGROUND));
  	}
  }
---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java	2006-10-22 00:19:54.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpdt/externaltools/actions/PHPRestartApacheAction.java	2008-06-22 17:34:10.000000000 +0100
+Index: /home/mbooth/workspace-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)
 @@ -11,20 +11,31 @@
   **********************************************************************/
  package net.sourceforge.phpdt.externaltools.actions;
@@ -248,7 +222,7 @@
  import org.eclipse.jface.action.IAction;
  import org.eclipse.jface.preference.IPreferenceStore;
  
- public class PHPRestartApacheAction extends PHPStartApacheAction {
+ public class PHPStopApacheAction extends PHPStartApacheAction {
  	public void run(IAction action) {
 +		final IPreferenceStore webUIStore = WebUI.getDefault()
 +		.getPreferenceStore();
@@ -256,42 +230,26 @@
 +		String documentRoot = webUIStore.getString(WebUI.PHP_DOCUMENTROOT_PREF);
  		final IPreferenceStore store = ExternalToolsPlugin.getDefault()
  				.getPreferenceStore();
--		// execute(store.getString(PHPeclipsePlugin.APACHE_RESTART_PREF),
--		// "Restart Apache: ");
+-		// execute(store.getString(PHPeclipsePlugin.APACHE_STOP_PREF), "Stop
+-		// Apache: ");
 +
 +		// replace backslash with slash in the DocumentRoot under Windows
 +		documentRoot = documentRoot.replace('\\', '/');
 +		String[] arguments = { documentRoot, new Integer(WebUI.getDefault().getHttpdPort()).toString() };
 +		MessageFormat form = new MessageFormat(store
-+				.getString(ExternalToolsPlugin.APACHE_RESTART_PREF));
- 		execute("apache_restart", store
++				.getString(ExternalToolsPlugin.APACHE_STOP_PREF));
+ 		execute("apache_stop", store
 -				.getString(ExternalToolsPlugin.APACHE_RUN_PREF), store
--				.getString(ExternalToolsPlugin.APACHE_RESTART_PREF), store
+-				.getString(ExternalToolsPlugin.APACHE_STOP_PREF), store
 +				.getString(ExternalToolsPlugin.APACHE_RUN_PREF), form
 +				.format(arguments), store
- 				.getBoolean(ExternalToolsPlugin.APACHE_RESTART_BACKGROUND));
+ 				.getBoolean(ExternalToolsPlugin.APACHE_STOP_BACKGROUND));
  	}
  }
---- net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java	2008-01-23 21:53:45.000000000 +0000
-+++ net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java	2008-06-23 00:03:35.000000000 +0100
-@@ -52,6 +52,7 @@
- import net.sourceforge.phpeclipse.builder.ExternalStorageDocumentProvider;
- import net.sourceforge.phpeclipse.builder.FileStorage;
- import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
-+import net.sourceforge.phpeclipse.externaltools.ExternalToolsPlugin;
- import net.sourceforge.phpeclipse.phpeditor.CustomBufferFactory;
- import net.sourceforge.phpeclipse.phpeditor.DocumentAdapter;
- import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider;
-@@ -989,6 +990,7 @@
- 
- 			// RefactoringCore.getUndoManager().shutdown();
- 		} finally {
-+			ExternalToolsPlugin.getDefault().stopHttpd();
- 			super.stop(context);
- 		}
- 	}
---- net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java	2006-10-22 00:19:54.000000000 +0100
-+++ net.sourceforge.phpeclipse.externaltools/src/net/sourceforge/phpeclipse/externaltools/ExternalToolsPlugin.java	2008-06-23 00:01:11.000000000 +0100
+Index: /home/mbooth/workspace-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)
 @@ -15,6 +15,7 @@
  import java.util.Enumeration;
  import java.util.PropertyResourceBundle;
@@ -327,3 +285,66 @@
 +	}
  }
 \ No newline at end of file
+Index: /home/mbooth/workspace-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)
+@@ -5,6 +5,7 @@
+                icons/,\
+                META-INF/,\
+                plugin.properties,\
++               conf/,\
+                prefs/
+ src.includes = src/,\
+                build.properties,\
+@@ -15,4 +16,9 @@
+                .cvsignore,\
+                .project,\
+                META-INF/,\
++               conf/,\
+                prefs/
++bin.excludes = prefs/default_macosx.properties,\
++               prefs/default_win32.properties
++src.excludes = prefs/default_macosx.properties,\
++               prefs/default_win32.properties
+Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml
+===================================================================
+--- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(revision 1625)
++++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.externaltools/plugin.xml	(working copy)
+@@ -192,11 +192,6 @@
+ 	  </page>
+ 	  <page
+ 			category="net.sourceforge.phpdt.externaltools.preferences"
+-			class="net.sourceforge.phpdt.externaltools.preferences.XamppPrefencePage"
+-			id="net.sourceforge.phpeclipse.externaltools.xampp.preferences"
+-			name="XAMPP"/>
+-	  <page
+-			category="net.sourceforge.phpdt.externaltools.preferences"
+ 			class="net.sourceforge.phpdt.externaltools.preferences.MySQLPreferencePage"
+ 			id="net.sourceforge.phpeclipse.externaltools.mysql.preferences"
+ 			name="MySQL"/>
+@@ -268,24 +263,6 @@
+ 			   toolbarPath="Normal"
+ 			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartMySQLAction">
+ 		 </action>
+-		 <action
+-			   label="Stop XAMPP"
+-			   icon="icons/obj16/xampp_stop.gif"
+-			   tooltip="Stop XAMPP"
+-			   class="net.sourceforge.phpdt.externaltools.actions.PHPStopXAMPPAction"
+-			   menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+-			   toolbarPath="Normal"
+-			   id="net.sourceforge.phpdt.externaltools.actions.PHPStopXAMPPAction">
+-		 </action>
+-		 <action
+-			   label="Start XAMPP"
+-			   icon="icons/obj16/xampp_start.gif"
+-			   tooltip="Start XAMPP"
+-			   class="net.sourceforge.phpdt.externaltools.actions.PHPStartXAMPPAction"
+-			   menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+-			   toolbarPath="Normal"
+-			   id="net.sourceforge.phpdt.externaltools.actions.PHPStartXAMPPAction">
+-		 </action>
+ 	  </actionSet>
+ 	</extension>
+ 

eclipse-phpeclipse-no-htmlparser.patch:

Index: eclipse-phpeclipse-no-htmlparser.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse-no-htmlparser.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eclipse-phpeclipse-no-htmlparser.patch	28 Jun 2008 19:15:15 -0000	1.1
+++ eclipse-phpeclipse-no-htmlparser.patch	15 Nov 2008 02:23:30 -0000	1.2
@@ -1,5 +1,20 @@
---- net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	2008-04-07 19:44:48.000000000 +0100
-+++ net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	2008-06-22 11:49:09.000000000 +0100
+Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF
+===================================================================
+--- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF	(revision 1625)
++++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phpmanual/META-INF/MANIFEST.MF	(working copy)
+@@ -13,7 +13,6 @@
+  org.eclipse.ui.editors,
+  org.eclipse.ui.workbench.texteditor,
+  net.sourceforge.phpeclipse,
+- net.sourceforge.phpeclipse.phphelp,
+- net.sourceforge.phpeclipse.phpmanual.htmlparser
++ net.sourceforge.phpeclipse.phphelp
+ Eclipse-LazyStart: true
+ Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java
+===================================================================
+--- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(revision 1625)
++++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.phpmanual/src/net/sourceforge/phpeclipse/phpmanual/views/PHPManualView.java	(working copy)
 @@ -38,11 +38,11 @@
  import org.eclipse.ui.INullSelectionListener;
  import org.eclipse.ui.IWorkbenchPart;
@@ -33,81 +48,21 @@
  		return "";
  	}
  	/**
-@@ -357,4 +359,4 @@
- 		}
- 	}
+Index: /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.feature/feature.xml
+===================================================================
+--- /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.feature/feature.xml	(revision 1625)
++++ /home/mbooth/workspace-plugins/net.sourceforge.phpeclipse.feature/feature.xml	(working copy)
+@@ -309,12 +309,6 @@
+          version="0.0.0"/>
  
--}
-\ No newline at end of file
-+}
---- net.sourceforge.phpeclipse.phpmanual.htmlparser/build.properties	2007-11-20 01:42:36.000000000 +0000
-+++ net.sourceforge.phpeclipse.phpmanual.htmlparser/build.properties	2008-06-22 13:27:52.000000000 +0100
-@@ -1,7 +1,2 @@
- bin.includes = META-INF/,\
--               filterbuilder.jar,\
--               htmllexer.jar,\
--               htmlparser.jar,\
--               junit.jar,\
--               sax2.jar,\
--               thumbelina.jar
-+               xml-commons-apis.jar
---- net.sourceforge.phpeclipse.phpmanual.htmlparser/.classpath	2007-12-03 18:54:17.000000000 +0000
-+++ net.sourceforge.phpeclipse.phpmanual.htmlparser/.classpath	2008-06-22 11:54:07.000000000 +0100
-@@ -1,11 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <classpath>
--	<classpathentry exported="true" kind="lib" path="filterbuilder.jar"/>
--	<classpathentry exported="true" kind="lib" path="htmllexer.jar"/>
--	<classpathentry exported="true" kind="lib" path="htmlparser.jar"/>
--	<classpathentry exported="true" kind="lib" path="junit.jar"/>
--	<classpathentry exported="true" kind="lib" path="sax2.jar"/>
--	<classpathentry exported="true" kind="lib" path="thumbelina.jar"/>
-+	<classpathentry exported="true" kind="lib" path="xml-commons-apis.jar"/>
- 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- 	<classpathentry kind="output" path="bin"/>
---- net.sourceforge.phpeclipse.phpmanual.htmlparser/META-INF/MANIFEST.MF	2007-12-03 18:54:17.000000000 +0000
-+++ net.sourceforge.phpeclipse.phpmanual.htmlparser/META-INF/MANIFEST.MF	2008-06-22 13:27:30.000000000 +0100
-@@ -3,41 +3,9 @@
- Bundle-Name: Htmlparser Plug-in
- Bundle-SymbolicName: net.sourceforge.phpeclipse.phpmanual.htmlparser
- Bundle-Version: 1.6.0
--Bundle-ClassPath: filterbuilder.jar,
-- htmllexer.jar,
-- htmlparser.jar,
-- junit.jar,
-- sax2.jar,
-- thumbelina.jar
-+Bundle-ClassPath: xml-commons-apis.jar
- Bundle-Localization: plugin
- Export-Package: .,
-- junit.awtui,
-- junit.extensions,
-- junit.framework,
-- junit.runner,
-- junit.swingui,
-- junit.swingui.icons,
-- junit.textui,
-- org.htmlparser,
-- org.htmlparser.beans,
-- org.htmlparser.beans.images,
-- org.htmlparser.filters,
-- org.htmlparser.http,
-- org.htmlparser.lexer,
-- org.htmlparser.lexerapplications.thumbelina,
-- org.htmlparser.nodes,
-- org.htmlparser.parserapplications,
-- org.htmlparser.parserapplications.filterbuilder,
-- org.htmlparser.parserapplications.filterbuilder.images,
-- org.htmlparser.parserapplications.filterbuilder.layouts,
-- org.htmlparser.parserapplications.filterbuilder.wrappers,
-- org.htmlparser.parserapplications.filterbuilder.wrappers.images,
-- org.htmlparser.sax,
-- org.htmlparser.scanners,
-- org.htmlparser.tags,
-- org.htmlparser.util,
-- org.htmlparser.util.sort,
-- org.htmlparser.visitors,
-  org.xml.sax,
-  org.xml.sax.ext,
-  org.xml.sax.helpers
+    <plugin
+-         id="net.sourceforge.phpeclipse.phpmanual.htmlparser"
+-         download-size="0"
+-         install-size="0"
+-         version="0.0.0"/>
+-
+-   <plugin
+          id="net.sourceforge.phpeclipse.phphelp"
+          download-size="0"
+          install-size="0"
+

eclipse-phpeclipse-rm-win32-help.patch:

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-phpeclipse-rm-win32-help.patch	28 Jun 2008 19:15:15 -0000	1.2
+++ eclipse-phpeclipse-rm-win32-help.patch	15 Nov 2008 02:23:30 -0000	1.3
@@ -1,5 +1,7 @@
---- net.sourceforge.phpeclipse.phphelp/plugin.xml	2007-09-08 19:41:55.000000000 +0100
-+++ net.sourceforge.phpeclipse.phphelp/plugin.xml	2008-06-14 18:32:13.000000000 +0100
+Index: /home/mbooth/workspace-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)
 @@ -65,12 +65,6 @@
     <extension
           point="org.eclipse.ui.preferencePages">


Index: eclipse-phpeclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/eclipse-phpeclipse.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eclipse-phpeclipse.spec	14 Sep 2008 23:26:26 -0000	1.8
+++ eclipse-phpeclipse.spec	15 Nov 2008 02:23:30 -0000	1.9
@@ -2,8 +2,8 @@
 %define gcj_support      1
 
 Name:      eclipse-phpeclipse
-Version:   1.2.0
-Release:   0.4.svn1573%{?dist}
+Version:   1.2.1
+Release:   1%{?dist}
 Summary:   PHP Eclipse plugin
 Group:     Development/Tools
 License:   CPL
@@ -51,24 +51,23 @@
 %setup -q -n phpeclipse-%{version}
 
 # apply patches
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
+%patch0 -p4
+%patch1 -p4
+%patch2 -p4
+%patch3 -p4
+%patch4 -p4
+%patch5 -p4
+%patch6 -p4
 
 # 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
-build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis
+#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
+#build-jar-repository -s -p net.sourceforge.phpeclipse.phpmanual.htmlparser xml-commons-apis
 
-# this is done in a patch instead
 #grep -lR sax2 * | xargs sed --in-place "s/sax2/xml-commons-apis/"
 
 # fix jar versions
@@ -108,10 +107,10 @@
 
 # need to recreate the symlinks to libraries that were setup in "prep"
 # because for some reason the ant copy task doesn't preserve them
-pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
-rm *.jar
-build-jar-repository -s -p . xml-commons-apis
-popd
+#pushd $installDir/eclipse/plugins/net.sourceforge.phpeclipse.phpmanual.htmlparser_*
+#rm *.jar
+#build-jar-repository -s -p . xml-commons-apis
+#popd
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
@@ -131,11 +130,17 @@
 %{_datadir}/eclipse/dropins/phpeclipse
 %{_datadir}/eclipse/dropins/phpeclipse-debug
 %{_datadir}/eclipse/dropins/phpeclipse-xdebug
+
 %if %{gcj_support}
 %{_libdir}/gcj/%{name}
 %endif
 
 %changelog
+* Fri Nov 14 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.1-1
+- Update to 1.2.1 and rebase patches.
+- Fixes mark occurances bug in Eclipse 3.4 (#706).
+- Fix NPE on shutdown if external tools are not used.
+
 * Tue Sep 09 2008 Mat Booth <fedora at matbooth.co.uk> 1.2.0-0.4.svn1573
 - Fix FTBFS due to patch fuzz.
 


Index: get-phpeclipse.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/get-phpeclipse.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- get-phpeclipse.sh	28 Jun 2008 19:15:15 -0000	1.1
+++ get-phpeclipse.sh	15 Nov 2008 02:23:30 -0000	1.2
@@ -1,36 +1,35 @@
 #!/bin/sh
 NAME="phpeclipse"
-VERSION=1.2.0
-REV="1573"
+VERSION=1.2.1
+TAG="1.2.1"
 
 echo "Exporting from SVN..."
 mkdir $NAME-$VERSION
 pushd $NAME-$VERSION >/dev/null
 for m in \
-		net.sourceforge.phpeclipse.debug.feature \
-		net.sourceforge.phpeclipse.feature \
-		net.sourceforge.phpeclipse.xdebug.feature \
+		net.sourceforge.phpeclipse \
 		net.sourceforge.phpeclipse.core \
 		net.sourceforge.phpeclipse.debug.core \
+		net.sourceforge.phpeclipse.debug.feature \
 		net.sourceforge.phpeclipse.debug.ui \
 		net.sourceforge.phpeclipse.externaltools \
+		net.sourceforge.phpeclipse.feature \
 		net.sourceforge.phpeclipse.help \
 		net.sourceforge.phpeclipse.launching \
 		net.sourceforge.phpeclipse.phphelp \
-		net.sourceforge.phpeclipse.phpmanual.htmlparser \
 		net.sourceforge.phpeclipse.phpmanual \
 		net.sourceforge.phpeclipse.smarty.ui \
 		net.sourceforge.phpeclipse.ui \
 		net.sourceforge.phpeclipse.webbrowser \
 		net.sourceforge.phpeclipse.xdebug.core \
+		net.sourceforge.phpeclipse.xdebug.feature \
 		net.sourceforge.phpeclipse.xdebug.ui \
 		net.sourceforge.phpeclipse.xml.core \
-		net.sourceforge.phpeclipse.xml.ui \
-		net.sourceforge.phpeclipse; do
-	svn export -r $REV http://svn.phpeclipse.com/phpeclipse/trunk/$m
+		net.sourceforge.phpeclipse.xml.ui; do
+	svn export http://svn.phpeclipse.com/tags/$TAG/$m
 	if [ $? -eq 1 ]; then
 		sleep 10
-		svn export -r $REV http://svn.phpeclipse.com/phpeclipse/trunk/$m
+		svn export http://svn.phpeclipse.com/tags/$TAG/$m
 		if [ $? -eq 1 ]; then 
 			echo "ERROR: There was a problem checking out module: $m"
 			exit 1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-phpeclipse/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Jun 2008 19:15:15 -0000	1.3
+++ sources	15 Nov 2008 02:23:30 -0000	1.4
@@ -1 +1 @@
-7e80bbf2cebb44617f2aee36d0802574  phpeclipse-1.2.0.tar.gz
+a0ccdfd8056caa958bff85f7e7b1adc9  phpeclipse-1.2.1.tar.gz

More information about the scm-commits mailing list