up to 6.0

file watcher is not working, i.e it considers it outdated (on 32/64 bit
both):

Java HotSpot(TM) 64-Bit Server VM (build 20.14-b01, mixed mode)
[   2712]   WARN - api.vfs.impl.local.FileWatcher - Native file watcher executable is outdated

diff --git a/phpstorm.spec b/phpstorm.spec
index 00505d4a32a5983f988bf0f3d2570020166d16bd..eed0b2312e0fb82dd27ebcfd4ec044308cbd851d 100644 (file)
--- a/phpstorm.spec
+++ b/phpstorm.spec
@@ -1,13 +1,13 @@
 %include       /usr/lib/rpm/macros.java
 Summary:       Lightweight and Smart PHP IDE
 Name:          phpstorm
-Version:       5.0.4
+Version:       6.0
 Release:       1
 # TODO: figure out what's the licensing and redistribution
 License:       ?
 Group:         Development/Tools
 Source0:       http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
-# NoSource0-md5:       3c85588bb0b89ff565c64b38da1eddc0
+# NoSource0-md5:       b05931fd96843e9bdd6a0992d4b241ed
 NoSource:      0
 Source1:       %{name}.desktop
 Patch0:                pld.patch
@@ -44,7 +44,7 @@ Note: PhpStorm includes all the functionality of WebStorm (HTML/CSS
 Editor, JavaScript Editor) and adds full-fledged support for PHP.
 
 %prep
-%setup -qn PhpStorm-121.390
+%setup -qn PhpStorm-127.100
 
 # keep only single arch files (don't want to pull 32bit deps by default),
 # if you want to mix, install rpm from both arch

diff --git a/pld.patch b/pld.patch
index d1e2edfbbcdede183d672bf840e2212f39e361db..6359047ab5578b5de73eb2d25c6c45ef9d2894fc 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
---- PhpStorm-121.215/bin/phpstorm.sh   2012-09-13 11:20:32.457844651 +0300
-+++ PhpStorm-121.390/bin/phpstorm.sh   2012-11-22 12:54:54.000000000 +0200
+--- PhpStorm-127.100/bin/phpstorm.sh~  2013-03-12 11:19:05.000000000 +0200
++++ PhpStorm-127.100/bin/phpstorm.sh   2013-03-13 21:09:15.996677961 +0200
 @@ -149,8 +149,11 @@
    fi
  fi
@@ -7,7 +7,7 @@
 +WEBIDE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/PhpStorm"
 +WEBIDE_CACHE_DIR="${XDG_CACHE_HOME:-$HOME/.cache}/PhpStorm"
 +
- COMMON_JVM_ARGS="\"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=WebIde50 $IDE_PROPERTIES_PROPERTY"
+ COMMON_JVM_ARGS="\"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=WebIde60 $IDE_PROPERTIES_PROPERTY"
 -IDE_JVM_ARGS="-Didea.platform.prefix=PhpStorm -Didea.no.jre.check=true"
 +IDE_JVM_ARGS="-Didea.platform.prefix=PhpStorm -Didea.no.jre.check=true -Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR"
  ALL_JVM_ARGS="$VM_OPTIONS $COMMON_JVM_ARGS $IDE_JVM_ARGS $AGENT $REQUIRED_JVM_ARGS"