packages: phpstorm/phpstorm.spec, phpstorm/pld.patch (NEW) - startup script...
glen
glen at pld-linux.org
Fri Mar 11 06:24:10 CET 2011
Author: glen Date: Fri Mar 11 05:24:10 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- startup script fixes: secure tmpfile, make it not interactive, no diffs on 64bit install paths
---- Files affected:
packages/phpstorm:
phpstorm.spec (1.2 -> 1.3) , pld.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/phpstorm/phpstorm.spec
diff -u packages/phpstorm/phpstorm.spec:1.2 packages/phpstorm/phpstorm.spec:1.3
--- packages/phpstorm/phpstorm.spec:1.2 Thu Mar 10 20:10:50 2011
+++ packages/phpstorm/phpstorm.spec Fri Mar 11 06:24:04 2011
@@ -8,9 +8,11 @@
Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz
# NoSource0-md5: a772dcf0c01231e814817309faf327a3
NoSource: 0
+Patch0: pld.patch
URL: http://www.jetbrains.com/phpstorm/
BuildRequires: unzip
Requires: jdk >= 1.6
+Requires: which
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _appdir %{_libdir}/%{name}
@@ -37,6 +39,7 @@
mv -f bin/libbreakgen{64,}.so
mv -f bin/libyjpagent{64,}.so
%endif
+%patch0 -p1
chmod a+rx bin/*.so bin/fsnotifier
mv bin/webide.png .
@@ -74,6 +77,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.3 2011/03/11 05:24:04 glen
+- startup script fixes: secure tmpfile, make it not interactive, no diffs on 64bit install paths
+
Revision 1.2 2011/03/10 19:10:50 glen
- add bin wrapper symlink
- keep license in original format
================================================================
Index: packages/phpstorm/pld.patch
diff -u /dev/null packages/phpstorm/pld.patch:1.1
--- /dev/null Fri Mar 11 06:24:10 2011
+++ packages/phpstorm/pld.patch Fri Mar 11 06:24:04 2011
@@ -0,0 +1,47 @@
+--- PhpStorm-103.99/bin/PhpStorm.sh~ 2011-02-14 11:51:19.000000000 +0200
++++ PhpStorm-103.99/bin/PhpStorm.sh 2011-03-11 07:22:06.119840468 +0200
+@@ -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
+- echo Press Enter to continue.
+- read IGNORE
+ exit 1
+ fi
+ fi
+
+-VERSION_LOG='/tmp/java.version.log'
++VERSION_LOG=$(mktemp java.version.XXXXXX 2>/dev/null || echo ${TMPDIR:-/tmp}/java.version.$$$RAND.log)
+ $WEBIDE_JDK/bin/java -version 2> $VERSION_LOG
+ grep 'OpenJDK' $VERSION_LOG
+ OPEN_JDK=$?
+-grep '64-Bit' $VERSION_LOG
+-BITS=$?
+ rm $VERSION_LOG
+ if [ $OPEN_JDK -eq 0 ]; then
+ echo WARNING: You are launching IDE using OpenJDK Java runtime
+@@ -48,14 +43,6 @@
+ 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
+- echo Press Enter to continue.
+- read IGNORE
+-fi
+-if [ $BITS -eq 0 ]; then
+- BITS="64"
+-else
+- BITS=""
+ fi
+
+ #--------------------------------------------------------------------------
+@@ -88,7 +75,7 @@
+
+ # PROFILE
+ if [ "false" = "true" ]; then
+- AGENT="-agentlib:yjpagent$BITS=disablej2ee,sessionname=webide"
++ AGENT="-agentlib:yjpagent=disablej2ee,sessionname=webide"
+ fi
+
+ REQUIRED_JVM_ARGS="-Xbootclasspath/a:../lib/boot.jar -Didea.no.jre.check=true $AGENT $WEBIDE_PROPERTIES_PROPERTY $REQUIRED_JVM_ARGS"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list