From: Elan Ruusamäe Date: Sat, 13 Dec 2014 20:23:04 +0000 (+0200) Subject: up to 8.0.2 X-Git-Tag: phpstorm-8.0.2-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=b464d1233d36d52e8e542c958dcfb5866c033052;p=packages%2Fphpstorm.git up to 8.0.2 --- diff --git a/phpstorm.spec b/phpstorm.spec index eb7d09d..4c5a011 100644 --- 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: 8.0.1 +Version: 8.0.2 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: cef81f374f35520b88fba5eb329e8b33 +# NoSource0-md5: fb1f77f063d666fb17c4d1d1e7844bab NoSource: 0 Source1: %{name}.desktop Source2: %{name}.py @@ -46,7 +46,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-138.2001.2328 +%setup -qn PhpStorm-139.732 # 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 dfc1de4..ea9cbad 100644 --- a/pld.patch +++ b/pld.patch @@ -1,5 +1,5 @@ ---- PhpStorm-138.2000.2262/bin/phpstorm.sh~ 2014-09-15 10:51:24.000000000 +0300 -+++ PhpStorm-138.2000.2262/bin/phpstorm.sh 2014-09-18 13:52:07.381670103 +0300 +--- PhpStorm-139.732/bin/phpstorm.sh~ 2014-12-10 13:42:32.000000000 +0200 ++++ PhpStorm-139.732/bin/phpstorm.sh 2014-12-13 21:00:59.776397175 +0200 @@ -152,8 +152,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=WebIde80 $IDE_PROPERTIES_PROPERTY" + COMMON_JVM_ARGS="-XX:ErrorFile=$HOME/java_error_in_WEBIDE_%p.log \"-Xbootclasspath/a:$IDE_HOME/lib/boot.jar\" -Didea.paths.selector=WebIde80 $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"