Author: glen Date: Sat Apr 28 11:48:19 2012 GMT Module: packages Tag: HEAD ---- Log message: - up to 4.0.1
---- Files affected: packages/phpstorm: phpstorm.spec (1.19 -> 1.20) , pld.patch (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/phpstorm/phpstorm.spec diff -u packages/phpstorm/phpstorm.spec:1.19 packages/phpstorm/phpstorm.spec:1.20 --- packages/phpstorm/phpstorm.spec:1.19 Wed Mar 7 19:49:35 2012 +++ packages/phpstorm/phpstorm.spec Sat Apr 28 13:48:13 2012 @@ -1,12 +1,12 @@ # $Revision$, $Date$ Summary: Lightweight and Smart PHP IDE Name: phpstorm -Version: 3.0.3 -Release: 0.1 +Version: 4.0.1 +Release: 1 License: ? Group: Development/Tools Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz -# NoSource0-md5: af1a42bd3a3ba7f20efc55c861870a39 +# NoSource0-md5: d7913aa7ee7dafb7ef7c232a0eb5ddd3 NoSource: 0 Source1: %{name}.desktop Patch0: pld.patch @@ -40,17 +40,19 @@ Editor, JavaScript Editor) and adds full-fledged support for PHP. %prep -%setup -qn PhpStorm-111.344 -# keep only single arch files +%setup -qn PhpStorm-117.257 + +# keep only single arch files (don't want to pull 32bit deps by default), +# if you want to mix, install rpm from both arch %ifarch %{ix86} rm bin/fsnotifier64 -rm bin/libbreakgen64.so -rm bin/libyjpagent64.so +rm bin/libyjpagent-linux64.so +rm bin/phpstorm64.vmoptions %endif %ifarch %{x8664} rm bin/fsnotifier -rm bin/libbreakgen.so -rm bin/libyjpagent.so +rm bin/libyjpagent-linux.so +rm bin/phpstorm.vmoptions %endif %patch0 -p1 chmod a+rx bin/*.so bin/fsnotifier* @@ -89,13 +91,13 @@ %{_appdir}/license %{_appdir}/plugins %dir %{_appdir}/bin -%{_appdir}/bin/phpstorm.vmoptions +%{_appdir}/bin/phpstorm*.vmoptions %{_appdir}/bin/idea.properties %{_appdir}/bin/log.xml %attr(755,root,root) %{_appdir}/bin/phpstorm.sh +%attr(755,root,root) %{_appdir}/bin/inspect.sh %attr(755,root,root) %{_appdir}/bin/fsnotifier* -%attr(755,root,root) %{_appdir}/bin/libbreakgen*.so -%attr(755,root,root) %{_appdir}/bin/libyjpagent*.so +%attr(755,root,root) %{_appdir}/bin/libyjpagent-linux*.so %{_desktopdir}/%{name}.desktop %{_pixmapsdir}/%{name}.png @@ -105,6 +107,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20 2012/04/28 11:48:13 glen +- up to 4.0.1 + Revision 1.19 2012/03/07 18:49:35 glen - up to 3.0.3 ================================================================ Index: packages/phpstorm/pld.patch diff -u packages/phpstorm/pld.patch:1.10 packages/phpstorm/pld.patch:1.11 --- packages/phpstorm/pld.patch:1.10 Thu Dec 15 15:42:47 2011 +++ packages/phpstorm/pld.patch Sat Apr 28 13:48:13 2012 @@ -1,62 +1,54 @@ ---- PhpStorm-111.19/bin/phpstorm.sh 2011-12-06 21:11:56.432592623 +0200 -+++ PhpStorm-111.19/bin/phpstorm.sh 2011-12-15 16:41:37.811850204 +0200 -@@ -45,7 +45,7 @@ - JDK="$JAVA_LOCATION" - fi +--- PhpStorm-117.257/bin/phpstorm.sh~ 2012-04-22 15:47:51.000000000 +0300 ++++ PhpStorm-117.257/bin/phpstorm.sh 2012-04-26 20:30:01.239110387 +0300 +@@ -37,7 +37,7 @@ fi -- if [ -z "$JDK" -a -x "/bin/readlink" ]; then -+ if [ -z "$JDK" -a -x "/usr/bin/readlink" ]; then - JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"` - case "$JAVA_LOCATION" in - */jre/bin/java) -@@ -122,7 +122,7 @@ - # only extract properties (not VM options) from Info.plist - INFO_PLIST_PARSER_OPTIONS="" - else -- [ "$BITS" == "64" ] && INFO_PLIST_PARSER_OPTIONS=" 64" || INFO_PLIST_PARSER_OPTIONS=" 32" -+ [ "$BITS" = "64" ] && INFO_PLIST_PARSER_OPTIONS=" 64" || INFO_PLIST_PARSER_OPTIONS=" 32" - fi - - # in Mac OS X ./Contents/Info.plist describes all VM options & system properties -@@ -132,7 +132,12 @@ + fi - REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.no.jre.check=true -Didea.paths.selector=WebIde10 $IDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS" +- if [ -z "$JDK" -a -x "/bin/readlink" ]; then ++ if [ -z "$JDK" -a -x "/bin/bin/readlink" ]; then + JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"` + case "$JAVA_LOCATION" in + */jre/bin/java) +@@ -132,8 +132,14 @@ + fi + fi --JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS $MAC_VM_OPTIONS $AGENT" -+WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde10" -+# if old dir does not exist, use new one ++WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde40" ++# versioned dir does not exist, use unversioned +if [ ! -d "$WEBIDE_CONFIG_HOME" ]; then + WEBIDE_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/WebIde" +fi -+JVM_ARGS="$JVM_ARGS $REQUIRED_JVM_ARGS -Dwebide.config.home=$WEBIDE_CONFIG_HOME $MAC_VM_OPTIONS $AGENT" - - CLASSPATH=../lib/bootstrap.jar - CLASSPATH=$CLASSPATH:../lib/util.jar ---- PhpStorm-111.19/bin/idea.properties~ 2011-11-28 11:44:59.000000000 +0200 -+++ PhpStorm-111.19/bin/idea.properties 2011-12-06 19:58:00.925419184 +0200 -@@ -12,22 +12,22 @@ - #--------------------------------------------------------------------- - # Uncomment this option if you want to customize path to WebIde config folder. Make sure you're using forward slashes ++ + COMMON_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.paths.selector=WebIde40 $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.home=$WEBIDE_CONFIG_HOME" + ALL_JVM_ARGS="$VM_OPTIONS $COMMON_JVM_ARGS $IDE_JVM_ARGS $AGENT $REQUIRED_JVM_ARGS" + + CLASSPATH="../lib/bootstrap.jar" +--- PhpStorm-117.257/bin/idea.properties~ 2012-04-22 15:43:53.000000000 +0300 ++++ PhpStorm-117.257/bin/idea.properties 2012-04-26 20:31:24.809350768 +0300 +@@ -13,21 +13,25 @@ + # Uncomment this option if you want to customize path to IDE config folder. Make sure you're using forward slashes #--------------------------------------------------------------------- --# idea.config.path=${user.home}/.WebIde/config + # idea.config.path=${user.home}/.WebIde/config +idea.config.path=${webide.config.home}/config #--------------------------------------------------------------------- - # Uncomment this option if you want to customize path to WebIde system folder. Make sure you're using forward slashes + # Uncomment this option if you want to customize path to IDE system folder. Make sure you're using forward slashes #--------------------------------------------------------------------- --# idea.system.path=${user.home}/.WebIde/system + # idea.system.path=${user.home}/.WebIde/system +idea.system.path=${webide.config.home}/system #--------------------------------------------------------------------- # Uncomment this option if you want to customize path to user installed plugins folder. Make sure you're using forward slashes #--------------------------------------------------------------------- --# idea.plugins.path=${user.home}/.WebIde/config/plugins + # idea.plugins.path=${user.home}/.WebIde/config/plugins +idea.plugins.path=${webide.config.home}/config/plugins #--------------------------------------------------------------------- - # Uncomment this option if you want to customize path to WebIde logs folder. Make sure you're using forward slashes + # Uncomment this option if you want to customize path to IDE logs folder. Make sure you're using forward slashes. #--------------------------------------------------------------------- --# idea.log.path=${user.home}/.WebIde/system/log + # idea.log.path=${user.home}/.WebIde/system/log +idea.log.path=${webide.config.home}/system/log #--------------------------------------------------------------------- ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/phpstorm/phpstorm.spec?r1=1.19&r2=1.20 http://cvs.pld-linux.org/packages/phpstorm/pld.patch?r1=1.10&r2=1.11 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
