packages: phpstorm/phpstorm.spec - revert hacks for lost symlinks, problem ...

[glen]

Author: glen                         Date: Sun Jan  8 23:48:48 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert hacks for lost symlinks, problem has been identified: https://bugs.launchpad.net/pld-linux/+bug/913572

---- Files affected:
packages/phpstorm:
   phpstorm.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/phpstorm/phpstorm.spec
diff -u packages/phpstorm/phpstorm.spec:1.15 packages/phpstorm/phpstorm.spec:1.16
--- packages/phpstorm/phpstorm.spec:1.15	Wed Dec  7 00:35:18 2011
+++ packages/phpstorm/phpstorm.spec	Mon Jan  9 00:48:43 2012
@@ -59,16 +59,6 @@
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-%build
-# replace with system jars
-ln -snf %{_javadir}/commons-codec-1.3.jar lib
-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
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_bindir},%{_pixmapsdir},%{_desktopdir}}
@@ -78,20 +68,18 @@
 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
 
-%post
-if [ "$1" = 1 ]; then
-	# NOTE: rpm is broken and does not install the symlinks. need to fixup manually.
-	# see the log: http://carme.pld-linux.org/~glen/phpstorm.log
-	# it seems to work on upgrades, so need to do that just once
-	cd %{_appdir}
-	ln -s %{_javadir}/commons-codec-1.3.jar lib
-	ln -s %{_javadir}/jgoodies-forms.jar lib/jgoodies-forms.jar
-	ln -s %{_javadir}/log4j.jar lib/log4j.jar
-fi
-
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/%{name}
@@ -117,6 +105,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2012/01/08 23:48:43  glen
+- revert hacks for lost symlinks, problem has been identified: https://bugs.launchpad.net/pld-linux/+bug/913572
+
 Revision 1.15  2011/12/06 23:35:18  glen
 - workaround for stupid rpm breakage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/phpstorm/phpstorm.spec?r1=1.15&r2=1.16&f=u