packages: lenya/lenya.spec - use bundled libraries, not system jars. Lenya ...

[pawelz]

Author: pawelz                       Date: Thu Oct  8 13:20:50 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use bundled libraries, not system jars. Lenya needs exact versions of jars.
  It won't work with any other jars.

---- Files affected:
packages/lenya:
   lenya.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/lenya/lenya.spec
diff -u packages/lenya/lenya.spec:1.3 packages/lenya/lenya.spec:1.4
--- packages/lenya/lenya.spec:1.3	Thu Oct  8 13:40:58 2009
+++ packages/lenya/lenya.spec	Thu Oct  8 15:20:44 2009
@@ -53,6 +53,12 @@
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/lenya,%{_datadir},%{_sharedstatedir}/{lenya,tomcat/conf/Catalina/localhost},/var/log/lenya}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sharedstatedir}/tomcat/conf/Catalina/localhost/lenya.xml
 cp -a build/lenya/webapp $RPM_BUILD_ROOT%{_datadir}/lenya
+
+# use libraries provided by lenya. Lenya need exact version of these jars.
+# Don't try to use system libraries. It won't work.
+mv $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/lib{/endorsed/*,}
+rmdir $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/lib/endorsed
+
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/log4j.xconf
 cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/cocoon.xconf
 cp %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/web.xml
@@ -61,12 +67,6 @@
   ln -sf %{_sysconfdir}/lenya/$(basename $I) $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/
 done
 
-required_jars="bcel regexp xalan xercesImpl xml-apis"
-for I in $required_jars; do
-  jar=$(find-jar $I)
-  ln -s $jar $RPM_BUILD_ROOT%{_datadir}/lenya/WEB-INF/lib
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,6 +86,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2009/10/08 13:20:44  pawelz
+- use bundled libraries, not system jars. Lenya needs exact versions of jars.
+  It won't work with any other jars.
+
 Revision 1.3  2009/10/08 11:40:58  pawelz
 - typo
 - more %docs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lenya/lenya.spec?r1=1.3&r2=1.4&f=u