[packages/phpstorm] do not replace jars with system ones

glen glen at pld-linux.org
Fri Apr 18 00:13:21 CEST 2014


commit f1229f3d05528135dbc76805198a2adbe1b846b1
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Apr 18 00:16:30 2014 +0300

    do not replace jars with system ones
    
    they get wrong over time and pld has older versions anyway

 phpstorm.spec | 15 ---------------
 1 file changed, 15 deletions(-)
---
diff --git a/phpstorm.spec b/phpstorm.spec
index 9233f64..a2dd9dc 100644
--- a/phpstorm.spec
+++ b/phpstorm.spec
@@ -16,12 +16,6 @@ BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 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:	jre >= 1.6
 Requires:	which
 Suggests:	cvs
@@ -83,15 +77,6 @@ cp -p webide.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 ln -s %{_appdir}/bin/phpstorm.sh $RPM_BUILD_ROOT%{_bindir}/phpstorm
 
-# replace with system jars
-ln -snf %{_javadir}/commons-codec-1.3.jar $RPM_BUILD_ROOT%{_appdir}/lib
-ln -snf %{_javadir}/jgoodies-forms.jar $RPM_BUILD_ROOT%{_appdir}/lib/jgoodies-forms.jar
-ln -snf %{_javadir}/log4j.jar $RPM_BUILD_ROOT%{_appdir}/lib/log4j.jar
-# these break:
-#ln -snf %{_javadir}/commons-collections.jar $RPM_BUILD_ROOT%{_appdir}/lib/commons-collections.jar
-#ln -snf %{_javadir}/jdom.jar $RPM_BUILD_ROOT%{_appdir}/lib/jdom.jar
-#ln -snf %{_javadir}/xercesImpl.jar $RPM_BUILD_ROOT%{_appdir}/lib/xerces.jar
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phpstorm.git/commitdiff/00f9a298f0b61133f95f5237bc617b019678ff89



More information about the pld-cvs-commit mailing list