Author: glen Date: Fri Mar 11 06:59:21 2011 GMT Module: packages Tag: HEAD ---- Log message: - use some system jars
---- Files affected: packages/phpstorm: phpstorm.spec (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/phpstorm/phpstorm.spec diff -u packages/phpstorm/phpstorm.spec:1.4 packages/phpstorm/phpstorm.spec:1.5 --- packages/phpstorm/phpstorm.spec:1.4 Fri Mar 11 06:58:19 2011 +++ packages/phpstorm/phpstorm.spec Fri Mar 11 07:59:15 2011 @@ -2,7 +2,7 @@ Summary: Lightweight and Smart PHP IDE Name: phpstorm Version: 2.0 -Release: 0.2 +Release: 0.3 License: ? Group: Development/Tools Source0: http://download.jetbrains.com/webide/PhpStorm-%{version}.tar.gz @@ -12,6 +12,12 @@ Patch0: pld.patch URL: http://www.jetbrains.com/phpstorm/ BuildRequires: unzip +Requires: java-commons-codec >= 1.3 +Requires: java-commons-collections +# pld version is 2.1 +#Requires: java-commons-lang >= 2.4 +Requires: java-jgoodies-forms +Requires: java-log4j Requires: jdk >= 1.6 Requires: which BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -44,6 +50,16 @@ chmod a+rx bin/*.so bin/fsnotifier mv bin/webide.png . +%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}/jdom.jar lib/jdom.jar +#ln -snf %{_javadir}/xercesImpl.jar lib/xerces.jar + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_pixmapsdir},%{_desktopdir}} @@ -81,6 +97,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2011/03/11 06:59:15 glen +- use some system jars + Revision 1.4 2011/03/11 05:58:19 glen - add desktop file, hardlink if possible on packaging install stage ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
