packages: phpstorm/phpstorm.spec, phpstorm/pld.patch - use original filenam...

[glen]

Author: glen                         Date: Tue Dec  6 23:34:59 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use original filenames, less patching and could do with 32bit jdk for lesser memory usage

---- Files affected:
packages/phpstorm:
   phpstorm.spec (1.13 -> 1.14) , pld.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/phpstorm/phpstorm.spec
diff -u packages/phpstorm/phpstorm.spec:1.13 packages/phpstorm/phpstorm.spec:1.14
--- packages/phpstorm/phpstorm.spec:1.13	Tue Dec  6 19:58:32 2011
+++ packages/phpstorm/phpstorm.spec	Wed Dec  7 00:34:53 2011
@@ -25,7 +25,9 @@
 Suggests:	subversion
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_appdir		%{_libdir}/%{name}
+# use /usr/lib, 64bit files are renamed,
+# this allows to install both arch files and to use 32bit jdk on 64bit os
+%define		_appdir		%{_prefix}/lib/%{name}
 
 %description
 PhpStorm is a lightweight and smart PHP IDE focused on developer
@@ -39,18 +41,19 @@
 
 %prep
 %setup -qn PhpStorm-111.19
+# keep only single arch files
 %ifarch %{ix86}
 rm bin/fsnotifier64
 rm bin/libbreakgen64.so
 rm bin/libyjpagent64.so
 %endif
 %ifarch %{x8664}
-mv -f bin/fsnotifier{64,}
-mv -f bin/libbreakgen{64,}.so
-mv -f bin/libyjpagent{64,}.so
+rm bin/fsnotifier
+rm bin/libbreakgen.so
+rm bin/libyjpagent.so
 %endif
 %patch0 -p1
-chmod a+rx bin/*.so bin/fsnotifier
+chmod a+rx bin/*.so bin/fsnotifier*
 mv bin/webide.png .
 
 # cleanup backups after patching
@@ -59,10 +62,10 @@
 %build
 # replace with system jars
 ln -snf %{_javadir}/commons-codec-1.3.jar lib
-ln -snf %{_javadir}/commons-collections.jar lib/commons-collections.jar
 ln -snf %{_javadir}/jgoodies-forms.jar lib/jgoodies-forms.jar
 ln -snf %{_javadir}/log4j.jar lib/log4j.jar
 # these break:
+#ln -snf %{_javadir}/commons-collections.jar lib/commons-collections.jar
 #ln -snf %{_javadir}/jdom.jar lib/jdom.jar
 #ln -snf %{_javadir}/xercesImpl.jar lib/xerces.jar
 
@@ -73,7 +76,7 @@
 cp -p webide.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 cp -a$l bin help lib license plugins $RPM_BUILD_ROOT%{_appdir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-ln -s %{_appdir}/bin/PhpStorm.sh $RPM_BUILD_ROOT%{_bindir}/phpstorm
+ln -s %{_appdir}/bin/phpstorm.sh $RPM_BUILD_ROOT%{_bindir}/phpstorm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -91,9 +94,9 @@
 %{_appdir}/bin/idea.properties
 %{_appdir}/bin/log.xml
 %attr(755,root,root) %{_appdir}/bin/phpstorm.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/fsnotifier*
+%attr(755,root,root) %{_appdir}/bin/libbreakgen*.so
+%attr(755,root,root) %{_appdir}/bin/libyjpagent*.so
 %{_desktopdir}/%{name}.desktop
 %{_pixmapsdir}/%{name}.png
 
@@ -103,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/12/06 23:34:53  glen
+- use original filenames, less patching and could do with 32bit jdk for lesser memory usage
+
 Revision 1.13  2011/12/06 18:58:32  glen
 - up to 3.0
 

================================================================
Index: packages/phpstorm/pld.patch
diff -u packages/phpstorm/pld.patch:1.8 packages/phpstorm/pld.patch:1.9
--- packages/phpstorm/pld.patch:1.8	Tue Dec  6 20:18:36 2011
+++ packages/phpstorm/pld.patch	Wed Dec  7 00:34:53 2011
@@ -1,38 +1,5 @@
 --- PhpStorm-111.19/bin/phpstorm.sh	2011-12-06 19:55:51.616124548 +0200
 +++ PhpStorm-111.19/bin/phpstorm.sh	2011-12-06 21:11:56.432592623 +0200
-@@ -63,9 +63,6 @@
-   if [ -z "$JDK" ]; then
-     echo "ERROR: cannot start WebIde."
-     echo "No JDK found. 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
-     exit 1
-   fi
- fi
-@@ -74,8 +71,6 @@
- $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."
-@@ -86,13 +81,6 @@
-   echo "         please validate either WEBIDE_JDK, JDK_HOME, or JAVA_HOME environment variable points to valid Oracle (Sun) JDK installation."
-   echo "         See http://ow.ly/6TuKQ for more info on switching default JDK"
-   echo
--  echo "Press Enter to continue."
--  read IGNORE
--fi
--if [ $BITS -eq 0 ]; then
--  BITS="64"
--else
--  BITS=""
- fi
- 
- #--------------------------------------------------------------------------
 @@ -134,7 +122,7 @@
    # only extract properties (not VM options) from Info.plist
    INFO_PLIST_PARSER_OPTIONS=""
================================================================

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