packages: phpstorm/phpstorm.spec, phpstorm/pld.patch - up to 2.1

[glen]

Author: glen                         Date: Wed Jun  1 09:04:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.1

---- Files affected:
packages/phpstorm:
   phpstorm.spec (1.7 -> 1.8) , pld.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/phpstorm/phpstorm.spec
diff -u packages/phpstorm/phpstorm.spec:1.7 packages/phpstorm/phpstorm.spec:1.8
--- packages/phpstorm/phpstorm.spec:1.7	Tue Mar 29 19:05:04 2011
+++ packages/phpstorm/phpstorm.spec	Wed Jun  1 11:04:28 2011
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
 Summary:	Lightweight and Smart PHP IDE
 Name:		phpstorm
-Version:	2.0.1
-Release:	0.1
+Version:	2.1
+Release:	1
 License:	?
 Group:		Development/Tools
 Source0:	http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
-# NoSource0-md5:	9f66a0f645fedd18649986df5f56eda4
+# NoSource0-md5:	372d8dd9669cc04dc663d582ad6c580f
 NoSource:	0
 Source1:	%{name}.desktop
 Patch0:		pld.patch
@@ -38,7 +38,7 @@
 Editor, JavaScript Editor) and adds full-fledged support for PHP.
 
 %prep
-%setup -qn PhpStorm-103.243
+%setup -qn PhpStorm-107.120
 %ifarch %{ix86}
 rm bin/fsnotifier64
 rm bin/libbreakgen64.so
@@ -100,6 +100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/06/01 09:04:28  glen
+- up to 2.1
+
 Revision 1.7  2011/03/29 17:05:04  glen
 - up to 2.0.1
 

================================================================
Index: packages/phpstorm/pld.patch
diff -u packages/phpstorm/pld.patch:1.2 packages/phpstorm/pld.patch:1.3
--- packages/phpstorm/pld.patch:1.2	Fri Mar 11 06:51:36 2011
+++ packages/phpstorm/pld.patch	Wed Jun  1 11:04:28 2011
@@ -1,9 +1,9 @@
---- PhpStorm-103.99/bin/PhpStorm.sh	2011-03-11 07:22:06.119840468 +0200
-+++ PhpStorm-103.99/bin/PhpStorm.sh	2011-03-11 07:48:34.858272711 +0200
+--- PhpStorm-107.120/bin/PhpStorm.sh~	2011-05-19 06:21:07.000000000 +0300
++++ PhpStorm-107.120/bin/PhpStorm.sh	2011-06-01 11:53:18.701430989 +0300
 @@ -27,19 +27,14 @@
    if [ -z "$WEBIDE_JDK" ]; then
      echo ERROR: cannot start WebIde.
-     echo No JDK found to run WebIde. Please validate either WEBIDE_JDK, JDK_HOME or JAVA_HOME points to valid JDK installation.
+     echo No JDK found to run WebIde. Please validate either WEBIDE_JDK, JDK_HOME or JAVA_HOME environment variable points to valid JDK installation.
 -    echo
 -    echo Press Enter to continue.
 -    read IGNORE
@@ -21,10 +21,10 @@
  rm $VERSION_LOG
  if [ $OPEN_JDK -eq 0 ]; then
    echo WARNING: You are launching IDE using OpenJDK Java runtime
-@@ -48,14 +43,6 @@
+@@ -48,15 +43,8 @@
    echo
    echo NOTE:    If you have both Sun JDK and OpenJDK installed
-   echo          please validate either WEBIDE_JDK or JDK_HOME points to valid Sun JDK installation
+   echo          please validate either WEBIDE_JDK or JDK_HOME environment variable points to valid Sun JDK installation
 -  echo
 -  echo Press Enter to continue.
 -  read IGNORE
@@ -34,12 +34,14 @@
 -else
 -  BITS=""
  fi
++BITS=""
  
  #--------------------------------------------------------------------------
-@@ -88,12 +75,13 @@
+ #   Ensure the WEBIDE_HOME var for this script points to the
+@@ -88,12 +76,13 @@
  
  # PROFILE
- if [ "false" = "true" ]; then
+ if [ "utils$_run_closure5 at 1898c18" = "true" ]; then
 - AGENT="-agentlib:yjpagent$BITS=disablej2ee,sessionname=webide"
 + AGENT="-agentlib:yjpagent=disablej2ee,sessionname=webide"
  fi
@@ -53,6 +55,7 @@
  
  CLASSPATH=../lib/bootstrap.jar
  CLASSPATH=$CLASSPATH:../lib/util.jar
+
 --- PhpStorm-103.99/bin/idea.properties~	2011-02-14 11:44:54.000000000 +0200
 +++ PhpStorm-103.99/bin/idea.properties	2011-03-11 07:48:34.638262763 +0200
 @@ -10,13 +10,13 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/pld.patch?r1=1.2&r2=1.3&f=u